renamed main.js to map.js
rewrote some things. map.js needs to be rewritten
fixed .gitignore
made some naming changes
merged changes