Nothing big
Merge branch 'master' of https://github.com/ronnienv/thoughts

Conflicts:
	app/views/thoughts/index.html.haml