Revert "I made changes to yo shiz"

Reverts nicknish/git-merge-demo#1