Worked on enroll page
Merge branch 'master' of https://github.com/camcross/rafiki
styles on styles on styles
Merge branch 'master' of https://github.com/camcross/rafiki

Conflicts:
	app/assets/stylesheets/subjects.css.scss
	app/views/subjects/index.html.erb