users can now create surveys
Merge branch 'master' of http://github.com/dcruz112/project2

Conflicts:
	Gemfile
	Gemfile.lock
	config/routes.rb
	db/schema.rb