Lite mer puill med Srp
Merge branch 'master' of https://github.com/kaety/iMat.git

Conflicts:
	bin/cards/UserStart.class
	bin/grp30/MainFrame$1.class
	bin/grp30/MainFrame$2.class
	bin/grp30/MainFrame$3.class
	bin/grp30/MainFrame$4.class
	bin/grp30/MainFrame$5.class
	bin/grp30/MainFrame$6.class
	bin/grp30/MainFrame$7.class
	bin/grp30/MainFrame$8.class
	bin/grp30/MainFrame.class
	src/SpecialPanels/SearchResultPanel.java
	src/grp30/testFrame.java