Johns Update
Merge branch 'develop' of github.com:uamuzibora/uamuzibora.org into develop

Conflicts:
	_posts/2013-12-01-api.md