modifying models __init__.py
fixed merge
Code to create map
added sublime-project and sublime-workspace files to the .gitignore
Merge branch 'master' of github.com:PhoenixRacing/PhoenixRacingWebApp-noregrets
fix merge conflicts