Merge remote-tracking branch 'jason/master'

Conflicts:
	TGOHProject/src/edu/ycp/cs/cs496/TGOH/MainActivity.java
Merge remote-tracking branch 'sam/master'
just merged with sam
Merge remote-tracking branch 'sam/master'
working on the real database
making the real database
did work on client/server communication