change
Merge branch 'master' of heroku.com:agile-tundra-8420

Conflicts:
	app/views/hello_world/index.html.erb
change