icon.png
Merge branch 'master' of
https://github.com/ajaravete/Au08_Jaravete_Kelc_Scheifinger.git

Conflicts:
	src/kjm/Frame.java