current state
Merge branch 'master' of github.com:kmccurdy/moodswings

Conflicts:
	design/index.html