Melody's 2p commit

Committing for her because GitHub only works on 10.8+
Merge branch 'master' of https://github.com/putty174/Swarch

Conflicts:
	Swarch/swarch.js