test merge
Merge branch 'maze_branch'
Merge branch 'master' of https://github.com/spitbreak/MazeExplorer
switch to manual explorer by net