wat
clean em out cleam em out
revert revert revert
Merge branch 'master' of github.com:stevenla/personal-website

Conflicts:
	style/app.css
Merge branch 'master' into gh-pages