Added .gitignore and merged map files from other branch