gitHub blows
Merge branch 'master' of https://github.com/KasperFranz/SU-project-El

Conflicts:
	src/view/CreateWorksheet.form
	src/view/CreateWorksheet.java
	src/view/MainFrame.java