Changed name
Revert "color change"

This reverts commit 5e12051c3c8066164e216c0cb78d160b5c77b15a.
Merge remote-tracking branch 'origin/jasonGriffith' into currentDevelopment
Merge remote-tracking branch 'origin/ryanHochmuth' into
currentDevelopment

Conflicts:
	2dEngine/CubeoTwo/com/ryan/cubeoTwo/screens/ScreenMainMenu.java
Added test var jason to Game
Merge branch 'ryanHochmuth' into currentDevelopment
Merge remote-tracking branch 'origin/jasonGriffith' into
currentDevelopment

Conflicts:
	2dEngine/src/com/ryan/engine/Game.java