Add database stuff to TestServer.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/example/matthew/databox/TestServer.java
CheckUserID TestServer.java
Merge remote-tracking branch 'origin/master'