styling and other code stuff
Merge branch 'master' of https://github.com/bitwit/lemonade-startup

Conflicts:
	js/index.js