test komentar entfernt
Merge branch 'master' of github.com:dan-42/dhbw-organizer
Simons commit ist viel cooler
Merge branch 'master' of github.com:dan-42/dhbw-organizer

Conflicts:
	src/de/dhbw/organizer/calendar/Constants.java
commit nachricht