updated makefile
Merge branch 'master' of https://github.com/chillaxtian/314_A6