blah
Merge branch 'master' of https://github.com/elisefung/Spectrum

Conflicts:
	css/style.css