implementing notes
fixed merge conflict in mapcreator.js