Changed colors, added end state
Removed pop-up window for end state.
Merge branch 'LevelGoal' into staging

Conflicts:
	level1.js