I did this work last night, and apparently did not commit it
Merge branch 'perms_testin_on_t_bears_laptop' of github.com:mrkplt/SkillEval

Conflicts:
	app/models/permission.rb