add tests for signin and session controller
Merge branch 'check-in-out' into sign-in-out

Conflicts:
	spec/factories.rb
merge