committing to emily
Merge branch 'redux' of https://github.com/slipring/cooliris into redux

Conflicts:
	index.html