junit

junit
Merge branch 'master' of https://github.com/cisbjmaclean/CIS2232_Intercession20132014_ClassProject

Conflicts:
	RegistrationBoard/nbproject/private/private.properties
	RegistrationBoard/nbproject/private/private.xml
	RegistrationBoard/nbproject/project.properties