change title index
Merge branch 'master' of heroku.com:cparram-testror

Conflicts:
	app/views/welcome/index.html.erb
update title