test
new test
Merge branch 'master' of git://github.com/080278/Elevator

Conflicts:
	src/Elevator/Events.java