transitions
Merge branch 'master' of https://github.com/maxlesser/wordofmouth

Conflicts:
	main.html
Merge branch 'master' of https://github.com/maxlesser/wordofmouth