text file reading for song
Merge branch 'master' of https://github.com/oncer/gamejam13
adding obstacle notes
obstacles
beat

Merge branch 'master' of https://github.com/oncer/gamejam13

Conflicts:
	src/Game.cpp
Merge branch 'master' of https://github.com/oncer/gamejam13