Remove old Makefile(that is what git is for)
Merge pull request #654 from ShadowNinja/remove_old_makefile

Remove old Makefile
Merge remote-tracking branch 'upstream/master'