Merge branch 'Cole-Bittel'
Merge branch 'John-DiBaggio'

Conflicts:
	js/main.js
fixed conflict

fixed conflict
Merge branch 'John-DiBaggio'
Merge branch 'master' into Cole-Bittel
Merge branch 'Cole-Bittel' of https://github.com/BigBangPhaserGame/big_bang_phaser_game_trial into Cole-Bittel

Conflicts:
	js/main.js