dgdfg
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Arraylist till parseCalendar
Merge remote-tracking branch 'origin/master'

Conflicts:
	intprog_project/src/controller/connectDB.java
ConnectDB does not work