Vet ej...
Merge branch 'master' of https://github.com/gojb/GoJbGit.git

Conflicts:
	GoJb/src/GoJb1.java