prod v10
prod v11
prod v12
my first commit
Merge branch 'master' of heroku.com:desolate-bastion-1352
image3,4,5 controller fix
image3,4,5 controller fix2
unicorn timeout to 120