minor changes
Merge branch 'master' of https://github.com/mierle/startedfromthebottom

Conflicts:
	index.html
	sass/style.scss
	style.css
Ignore