Unknown changes
Merge branch 'master' of https://github.com/RebeccaLynn/FOC-system

Conflicts:
	UserModel/nbproject/private/private.properties
Remove faculty and committee methods have been written, but not tested. They need to be tied into the GUI.