test comment
Merge branch 'master' of github.com:Gi11i4m/ChronoMaticProject

Conflicts:
	ChronoMaticFrontEnd/bin/be/artesis/timelog/gui/GUIForm.class