features and alignments not conflicting
Merge branch 'master' of https://github.com/pnic/Bachelor

Conflicts:
	src/Engine/LAP.java