uh some weird merge thingy
Merge branch 'master' of https://github.com/shadowthekid/shadowthekid.github.com

Conflicts:
	css/index.css