yeah buddy
Merge branch 'master' of https://github.com/SunBurst/devgui2

Conflicts:
	TestaKorv/src/Linneatestar.java