change
Merge branch 'master' of
https://github.com/cs2103aug2014-t16-2j/main.git

Conflicts:
	FlexiPlanner/src/UI/FlexiPlannerUI.java
Add DisplayedEntry, modify getTodayTask + overdue
nothing changes
Merge branch 'master' of
https://github.com/cs2103aug2014-t16-2j/main.git

Conflicts:
	FlexiPlanner/src/UI/FlexiPlannerUI.java
	FlexiPlanner/src/UI/Tray.java