adding a file to be later edited and deleted! :scream:
Dork! You forgot to pull first! Mergin'.

Merge branch 'master' of github.com:dotsara/wreck-it

* 'master' of github.com:dotsara/wreck-it:
  fixed stash conflict
  setting myself up for a conflict