Fixed the makefile
Fixed the mergefile
Merge branch 'master' of github.com:/Yoggiburken/Good-bye