add sign-in and sign up
Merge remote-tracking branch 'origin/master' into Richard

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

add sign-in and sign up