min
Merge branch 'master' of https://github.com/pnic/Bachelor.git

Conflicts:
	src/Engine/LAP.java