:q!
Merge branch 'master' of heroku.com:csstartup

Conflicts:
	index.html
	package.json