Worked on getting database communications working
Merge remote-tracking branch 'sam/master'

Conflicts:
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/servlet/Userpage.java