mazes
Merge branch 'master' of github.com:klauswuestefeld/zap

Conflicts:
	src/zapman/Zapman.java
Old maze commented