Merge pull request #1 from lnolson/master

update my repo
Merge branch 'master' of https://github.com/lnolson/snapp into upstream
Modify image controller, edit show view
Merge pull request #55 from tstouffe/master

Merge pull request #1 from lnolson/master