Adding weather images and improvements to back end
Merge branch 'master' of github.com:mfajardo/eltorito

Conflicts:
	hackathon/app/views/city.scala.html