fix git ignore with database stuff
Move factorygirl config to test env only
Merge branch 'hotfix/deployment'
WIP fixing deployment
WIP fixing deploy
Add staging secrets
WIP fixing deployment
WIP fixing deployment
Fix secrets
viewing a tutor application and get some placeholder grades
Set up courses index/show/edit
Fixed specs
Merge pull request #4 from aspett/feature/45-create_potential_tutor_profiles

viewing a tutor application and get some placeholder grades
Merge branch 'master' into feature/42-basic_courses

Conflicts:
	app/assets/javascripts/tutor_application.js.coffee
added comment to tutor profile
Merge pull request #5 from aspett/feature/33-add_comment_to_tutor_application

added comment to tutor profile
added base for excel exporting
Basic linking applications to courses complete
Merge branch 'master' into feature/42-basic_courses

Conflicts:
	app/views/tutor_applications/show.html.erb
	config/routes.rb
	db/schema.rb
Allocating and deallocating basics done