Added defaults to makefile
Merge branch 'game_dev' of github.com:alexredna/game_engine_scala into game_dev