Merge branch 'master' of https://git.heroku.com/immense-everglades-6242

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	myapp.rb
	views/cases.erb