Change title
Merge pull request #4 from Ipreaw/feature/change-title

Change title
Merge branch 'develop' into feature/add-header-line

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