adding about.html
fuck

Conflicts:
index.html
style.css
Merge branch 'master' of https://github.com/iamallen/iamallen.github.io

Conflicts:
	index.html
	style.css