feature grant access
Merge branch 'master' of github.com:Renesau/dinosir

Conflicts:
	app/actions.rb
smallchanges
homepage enter button
nav bar colour changes
Merge branch 'master' of github.com:Renesau/dinosir
feature authorization
feature authorization
feature authorization
login buttons changed
fix project table
fix project table
Merge branch 'master' of github.com:Renesau/dinosir

Conflicts:
	app/actions.rb
projects belongs to cohorts