added colleges to database
Merge remote-tracking branch 'origin/master'

Conflicts:
	build/classes/finalproject/FinalProject.class
	derby.log
	nbproject/private/private.xml
	university/log/log.ctrl
	university/log/log1.dat
	university/log/logmirror.ctrl
	university/seg0/c150.dat
	university/seg0/c161.dat
	university/seg0/c171.dat
	university/seg0/c230.dat
	university/seg0/c90.dat
	university/seg0/ca1.dat
	university/seg0/cb1.dat