Generator work in progress
Merge branch 'master' of github.com:RandomUniqueName2/Groep2_Thema7

Conflicts:
	Project Files/src/gui/GeneratorMainFrame.java