Fixed Makefile
Merge branch 'master' of https://github.com/emreturkoz34/apc524