fixed merge conflicts and put levels and decisions together
Merge branch 'levels' of https://github.com/GOOD-MUSIC/FinalProject into levels

Conflicts:
	ObstacleGame/Decision_class.pde
	ObstacleGame/ObstacleGame.pde