Worked on Teacher Notification Page.  Added other layouts to allow
usernames (currently replaced by dummy names) to each have a checkbox
associated to each name.
Merge remote-tracking branch 'Cody/master'

Conflicts:
	TGOHProject/src/edu/ycp/cs/cs496/TGOH/controller/AddCourse.java
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/Classes/Courses.java
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/User/User.java
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/pesist/FakeDatabase.java
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/pesist/IDatabase.java
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/servlet/Userpage.java
	TGOHServerside/war/WEB-INF/web.xml
Merge remote-tracking branch 'CodyHoward/master'

Conflicts:
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/pesist/FakeDatabase.java
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/servlet/Userpage.java
	TGOHServerside/war/WEB-INF/web.xml
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'JasonFiddle/master'

Conflicts:
	TGOHProject/src/edu/ycp/cs/cs496/TGOH/controller/AddCourse.java
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/pesist/FakeDatabase.java
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/pesist/IDatabase.java
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/servlet/Userpage.java