History, rsmol, etc.
Merge branch 'master' of https://github.com/pnic/Bachelor
git

Conflicts:
	src/Engine/LAP.java
	src/Engine/LAPEditor.java

Conflicts:
	src/Engine/LAP.java
	src/Engine/LAPEditor.java