fomratting
Merge branch 'master' of https://github.com/okwan/shiftsix

Conflicts:
	New folder/scaletest.html