Stage 1 done
Merge branch 'master' of https://github.com/EightAndAHalfTails/inf224-media-fs
I fucked up
Conflicts:
	GUI$AddTextAction1.class
	GUI$AddTextAction2.class
	GUI$CloseListener.class
	GUI.class
	GUI.java