finished sign_in and sign_up, changed controller
Merge branch 'chris_views'

Conflicts:
	app/controllers/index.rb