Added all Daves code to the main screen
Daves code
Merge branch 'master' of https://github.com/johntk/JAKD

Conflicts:
	src/reports/Calender.java