Broken TestUtility. DO NOT USE right now.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	DineOnLibrary/src/uw/cse/dineon/library/RestaurantInfo.java
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	DineOnLibrary/src/uw/cse/dineon/library/util/TestUtility.java
Merge remote-tracking branch 'upstream/master'

Conflicts:
	DineOnUserApplication/tests/src/uw/cse/dineon/user/bill/test/CurrentOrderActivityTest.java
Merge pull request #219 from espeo196/master

CreateNewAccount test, style fixes, and changes to other tests.