Whoops.(merge w/master):
Now loads XML and shows customerinfo
Merge branch 'develop' into feature-main
Merge branch 'feature-main' into develop
Created a simulation frame that can show itself
Merge branch 'feature-simulation' into develop
Merge branch 'develop' of github.com:luukholleman/ASRSJava into develop
Finished simulation, cant get XML so requires test data.
Merge branch 'feature-simulation' into develop
fixed merging bugs
Merge branch 'develop'