welcome page with sign in complete
Merge branch 'master' into backend_setup

Conflicts:
	app/views/layout.erb
Merge pull request #2 from jasminmayfield/backend_setup

Backend setup