.gitignore in gatling-0.0.3 vs .gitignore in gatling-0.9.9

@@ -1,4 +1,11 @@
+<<<<<<< HEAD
+*.png
+=======
 *.gem
 .bundle
 Gemfile.lock
 pkg/*
+*.orig
+test*
+.idea*
+>>>>>>> 942d4a993ee6a3407063786d0431cdfd553629ed