Appointment Changes
Merge branch 'master' of https://github.com/JsFlo/ScheduleHelper
Merge branch 'master' of https://github.com/JsFlo/ScheduleHelper

Conflicts:
	src/main/java/DataStorage/DataStorage.java
Appointment SQL
Merge branch 'master' of https://github.com/JsFlo/ScheduleHelper

Conflicts:
	src/main/java/DataStorage/DataStorage.java