Add viewToday() and viewThisWeek() on Read class.
Resolve Conflict of InputWindow

Conflicts:
	InputWindow.java