Fix factory girl require hopefully
Add factory girl temporarily
Fix thing please
Merge branch 'master' into integration

Conflicts:
	config/application.rb
added navbar
Completed Story 69

Enforced authorization rules
Bootstrapped login, register
Fix indentation
Make some tests
Fixed specs to account for new signup/signin
Merge branch 'master' into integration
Added gender to tutor application
Merge pull request #10 from aspett/feature/78-navbar

added navbar
Merge pull request #12 from aspett/feature/72-gender
[skip ci] Always requiring login, exempting some actions
Merge branch 'integration' into feature/69-enforce_login

Conflicts:
	app/views/layouts/application.html.erb
	db/schema.rb
Merge branch 'feature/69-enforce_login' into integration
Merge pull request #14 from aspett/integration

Integration