did I make changes?
Merge branch 'master' of
https://github.com/RealStandardStudios/JefXif.git

Conflicts:
	src/jefXif/DialogController.java