Add header line
Merge branch 'develop' into feature/add-header-line

Conflicts:
	app/views/welcome/index.html.erb
Merge pull request #3 from Ipreaw/feature/add-header-line

Add header line