updates
aMerge branch 'master' of https://github.com/jasonhodges/jasonhodges.github.io

Conflicts:
	styles/nomedia.css
	styles/screen.css