Minor changes
Merge remote-tracking branch 'Cody/master'
Added the Teacher's Home Page.  Also fixed slight issue with button id's
adding the adding controller, servlet, and database functions.
Merge remote-tracking branch 'Jason/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'sam/master'

Conflicts:
	TGOHProject/src/edu/ycp/cs/cs496/TGOH/controller/AddCourse.java
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/User/User.java
Fixed some inconsistancies.
Merge remote-tracking branch 'CodyHoward/master'