<<<<<<< HEAD *.png ======= *.gem .bundle Gemfile.lock pkg/* *.orig test* .idea* >>>>>>> 942d4a993ee6a3407063786d0431cdfd553629ed