debug info
Merge branch 'master' of github.com:Atlas-/robits
Merge branch 'master' of github.com:Atlas-/robits
adding map1
merge