update
Merge branch 'master' of https://github.com/iamallen/iamallen.github.io

Conflicts:
	index.html
	stylesheets/styles.css