improved make structure
Merge branch 'master' of https://github.com/chillaxtian/221_A2