Registration servlet and code in, but it is not functioning
Merge remote-tracking branch 'aroth4Fetch/master'

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