design updates
Merge commit 'c5bbadae8b61f6acfae1f238f670880e41f508e5'

Conflicts:
	2014/css/application.css
	2014/index.html
	2014/scss/application.scss