updated makefile
Merge branch 'master' of https://github.com/htebalaka/drunken-octo-adventure
Merge branch 'master' of https://github.com/htebalaka/drunken-octo-adventure