Makefile changes
Merge branch 'master' of github.com:Dynalon/Rainy