Revert "I am a total noob to git :P"

This reverts commit 78a356a35670889a4b49e80ce11c1ecf80f8646b.
Should fix the issues with merging.