Big jumble o' stuff, work content mostly
oops

Conflicts:
	_assets/images/wander/wander-desktop.png
	_assets/images/wander/wander-featured.png
	_site/assets/style.css.gz
	_site/assets/wander/wander-desktop.png
	_site/assets/wander/wander-featured.png
	_site/portfolio/wander/index.html
	portfolio/_posts/2014-07-08-wander.md