removed since edit now does the job for both
removed old prototype of view and edit
removed unused test file
minor test data
part of fix for cancel buttonwq
changed to protected for inheritance access
edit now handles both create and edit, and doesn't fail massively
delegating method to remove element from calendar
appointment constructor is written correctly now
additional test data
rewrote calendarprogram to use one method for edit/create
Merge branch 'master' of github.com:aleksanb/fellesprosjektet

Conflicts:
	src/gui/AddAppointmentPanel.java
	src/gui/EditAppointmentPanel.java