.gitignore in gatling-1.0.2 vs .gitignore in gatling-1.0.3

@@ -1,11 +1,11 @@
-<<<<<<< HEAD
 *.png
-=======
 *.gem
 .bundle
 Gemfile.lock
 pkg/*
 *.orig
 test*
 .idea*
->>>>>>> 942d4a993ee6a3407063786d0431cdfd553629ed
+.DS_Store
+spec/support/ready_candidate_ref/temp/*
+reports/*