fitta eller nått
Merge branch 'master' of github.com:anerud/AIGroup1

Conflicts:
	javaprolog/main/Shrdlite.java