Controller SignIn & SignOut Routes Complete
Merge pull request #5 from danielleadams/Indigo

Indigo
add sign-in and sign up
Merge pull request #6 from danielleadams/john/controller

Controller SignIn & SignOut Routes Complete
Merge remote-tracking branch 'origin/master' into Richard

Conflicts:
	app/controllers/index.rb
adding quiz title display
Merge pull request #7 from danielleadams/Richard

add sign-in and sign up
Merge remote-tracking branch 'origin/master' into Indigo
add encrypted emails upon user create
add username uniqueness validation
Surveys all now displaying all surveys, as you do
Merge remote-tracking branch 'origin/master' into Indigo