Merge pull request #12 from JoshFB/welcomeMessage

Welcome message
fixed problems with sign in and sign up and feature tests
Merge pull request #14 from JoshFB/FixLogging

fixed problems with sign in and sign up and feature tests
Merge branch 'cleanUp' of github.com:JoshFB/Talent_Hacked_Code into cleanUp

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