student
Merge branch 'master' of
https://github.com/UIC-FYP-2014-Fall/FYP-Coordination-System.git

Conflicts:
	src/com/uic/domain/Student.hbm.xml
	src/hibernate.cfg.xml