great success
Merge branch 'master' of https://github.com/jdhartley/synaesthetic

Conflicts:
	index.html