23-12-2013
Merge branch 'master' of https://github.com/kiryl-t/lift-case

Conflicts:
	LiftSystem/src/liftsystem/LiftShaft.java