Makefile edit
Merge branch 'master' of https://github.com/Valtis/Peliprojekti-2013