wip Sat Apr  5 18:28:34 EDT 2014
voilà! a full blog is made!
Merge branch 'feature/blog' into develop
Merge branch 'release/blog'

Conflicts:
	index.html
	style.css