UI changed
Merge remote-tracking branch 'origin/master'
pushing again
Merge branch 'uiBranch' of github.com:SplurgeRestaurants/Splurge

Conflicts:
	Splurge/src/ucsd/cs110/splurge/CalendarAdapter.java