WIP
Merge branch 'master' of http://github.com/HampusDahlin/Beat-to-the-beat