blah
Revert "gave up trying to obtain network time"

This reverts commit 921b4f5b5fa72d6cdc0526ae6c838624423a09a7.

Conflicts:
	.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.jdt.core.external.folders/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.jdt.core.external.folders/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/TheDrinkChallenge/.indexes/a0/d6/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/TheDrinkChallenge/.indexes/e4/81/84/97/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/TheDrinkChallenge/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/TheDrinkChallenge/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap
	.metadata/.plugins/org.eclipse.jdt.core/1110053504.index
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	TheDrinkChallenge/bin/TheDrinkChallenge.apk
	TheDrinkChallenge/bin/classes.dex
	TheDrinkChallenge/bin/resources.ap_
	TheDrinkChallenge/res/layout/take_test.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	TheDrinkChallenge/.classpath
	TheDrinkChallenge/bin/TheDrinkChallenge.apk
	TheDrinkChallenge/bin/classes.dex
	TheDrinkChallenge/bin/classes/com/thedrinkchallenge/www/R$id.class
	TheDrinkChallenge/bin/classes/com/thedrinkchallenge/www/R$layout.class
	TheDrinkChallenge/bin/classes/com/thedrinkchallenge/www/R$menu.class
	TheDrinkChallenge/bin/classes/com/thedrinkchallenge/www/R$string.class
	TheDrinkChallenge/bin/classes/com/thedrinkchallenge/www/R$style.class
	TheDrinkChallenge/bin/resources.ap_
	TheDrinkChallenge/res/layout/take_test.xml
	TheDrinkChallenge/src/com/thedrinkchallenge/www/TakeTestAction.java