uh..
Merge branch 'gh-pages'

Conflicts:
	style.css
Merge branch 'gh-pages'
some additions

added boxes to later use as links to other projects that I will have
made. also some fluidity changes.
Merge branch 'master' into gh-pages