working in as/cat controller
Merge branch 'master' of https://github.com/jjfazio/308Grader
working in as/cat controller 2
Add Categories work but no GUI
Merge remote-tracking branch 'origin/master'

Conflicts:
	currentGradebook
	trunk/implementation/model/spreadsheet/SpreadsheetCourse.java