Logic: implemented endsOnGivenTime and endsOnGivenDate
Merge branch 'master' of
https://github.com/cs2103aug2014-f09-1j/main.git

Conflicts:
	src/whatsupnext/logic/Logic.java