Still not getting merge logic. Still not loving the police.
Merge branch 'dev' of https://github.com/adius/feetbeatz into dev
feettest.qml finished as backup, almost full functionality.