Added logs folder and local settings file to gitignore
Merge branch 'master' of github.com:jaywhy13/vcs
Added static_root folder to gitignore
Integrated AT's work on the map component into the django site. Added the polling url (with needed views) to be used by the map)
Merge branch 'master' of github.com:jaywhy13/vcs