Merge pull request #1 from shivamd/survey

Survey
user login, logout, & signup
fixed merge conflict in gemfile
landing page design
Merge branch 'survey' of https://github.com/shivamd/survey_chimp into survey

Conflicts:
	app/views/layout.erb