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

Conflicts:
	src/Song.cpp
Merge branch 'master' of https://github.com/oncer/gamejam13
beat fix
Merge branch 'master' of https://github.com/oncer/gamejam13
beatfix, less faster notes
Merge branch 'master' of https://github.com/oncer/gamejam13