first django commit
Merge github.com:BrianSpry/map-app