Something added
Merge branch 'master' of github.com:miksturait/cloud-board

Conflicts:
	app/views/images/show.html.haml