asdf
Merge branch 'master' of https://github.com/hover20/proljekt

Conflicts:
	src/prologjavarobot/prologjavarobot/PrologTester.java