commit before pulling from origin
Merge branch 'development' of github.com:laurentqro/cantine into development
displays entry image if one is present
all views working and happy apart from users
Merge branch 'development' of github.com:laurentqro/cantine into development

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