New database with autofill categories
Merge branch 'master' of github.com:fazzel09/UCCP

Conflicts:
	courseplanner.sql
Merge branch 'master' of github.com:fazzel09/UCCP
Merge branch 'master' of github.com:fazzel09/UCCP

Conflicts:
	courseplanner.sql