Added images controller
Merge branch 'master' of github.com:wesleycho/saam