Music added
Merge remote-tracking branch 'origin/master'

Conflicts:
	gamejam2014/src/edu/virginia/cs/sgd/Program.java
	gamejam2014/src/edu/virginia/cs/sgd/screen/GameScreen.java
Merge branch 'master' of https://github.com/jackmacattack/gamejam2014.git
Merge branch 'master' of https://github.com/jackmacattack/gamejam2014.git