GUI Done, load file
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/solid/Controller.java