cool feature update
added comment
almost done
Merge branch 'cool_feature'

Conflicts:
	src/main/java/ie/cie/cad/MainApplication.java