bunch of stuff to add
more changes
Merge branch 'master' of github.com:fusion94/fusion94.github.com

Conflicts:
	atom.xml
	index.html
	public/about/index.html
	sitemap.xml