Ansicolor
Merge branch 'master' of github.com:ZeusWPI/FK-enrolment

Conflicts:
	Gemfile