index2 test
Merge branch 'master' of https://github.com/ttimmen/hexamusic

Conflicts:
	smartphone/js/index.js