update
Merge branch 'master' of github.com:napster99/napster99.github.com

Conflicts:
	_config.yml
	_layouts/default.html
	_layouts/page.html
	_layouts/post.html