minor change to the client side implementation, still need to test it
Merge remote-tracking branch 'hdao/master'

Conflicts:
	Unbearable/src/edu/ycp/cs/cs496/unbearable/MainActivity.java