added stuff
merged

Conflicts:
	_posts/2014-07-04-new-site.md
	index.html