First commit since name change
Merge branch 'master' of https://github.com/ddurfee/TemperamentStudio

Conflicts:
	README.md