Revert "Merge Conflict Resolution?"
Merge pull request #477 from ZomgPonies/revert-476-master

Revert "Merge Conflict Resolution?"
Merge pull request #478 from Fox-McCloud/master

Merge pull request #36 from ZomgPonies/master
Merge pull request #38 from ZomgPonies/master

FIX?!