adding updates to master
Merge branch 'gh-pages'

Conflicts:
	_site/about/index.html
	_site/index.html
	_site/leadership/2014/01/06/thoughts-on-leadership/index.html
	_site/mongodb/2014/01/06/mongodb-legacy-migration/index.html
adding updates
pushing new post
Merge remote-tracking branch 'origin/gh-pages'

Conflicts:
	_posts/2014-01-06-mongodb-legacy-migration.md
	_site/feed.articles.xml
	_site/feed.xml
	_site/mongodb/2014/01/06/mongodb-legacy-migration/index.html