fixed posts
Merge branch 'develop'

* develop:
  fixed posts

Conflicts:
	app/_posts/2014-03-15-move-over-grunt-introducing-gulp.md