add maps
Merge branch 'master' of https://github.com/skrogh/02102
fix editor rendering
tweaking parameters
fix indentation
Merge branch 'master' of https://github.com/skrogh/02102
Merge remote-tracking branch 'upstream/master'
faerdig?