Merge http://github.com/awarmwalrus/temporun

Conflicts:
	TempoRun/src/TheGame.java
Created a Song class to keep track of musics
Merge branch 'master' of git://github.com/aWarmWalrus/TempoRun
add song as a classs
Merge branch 'master' of git://github.com/aWarmWalrus/TempoRun

Conflicts:
	TempoRun/src/TheGame.java
Merge branch 'master' of git://github.com/aWarmWalrus/TempoRun

Conflicts:
	TempoRun/src/TheGame.java