Added Roles Into Project Description
fdgd

fdgfd
temporarily fixed reward and obstacle problem
Basic Game Complete
Initial Character Booleans
cleanup
Adjusted Miley
headshots
MERGE
Merge branch 'master' of https://github.com/GOOD-MUSIC/FinalProject
Merge remote-tracking branch 'origin/Character-Booleans'
Merge branch 'master' of https://github.com/GOOD-MUSIC/FinalProject
fixed data
no gravity
Added Game Testing Progress Document
Merge remote-tracking branch 'origin/Start/End'

Conflicts:
	Obstacle_Game/Obstacle_Game.pde
Merge of Game w/ problems
game fixed
character boolean fix
Edited Bug Report

Added Bug Report for 1/16/14