trying to get users
continuing to work on the get controller
Worked on getting database communications working
fixed the get controller
i did it
Merge remote-tracking branch 'sam/master'

Conflicts:
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/servlet/Userpage.java
Merge remote-tracking branch 'JasonFiddle/master'
Merge remote-tracking branch 'Jason/master'
saved
Fixed a little t1hing
Minor changes