WIP
Merge branch 'develop' of github.com:AndrewRandall/stardust into develop

Conflicts:
	app/views/posts/index.html.erb