Added geoloc to models.py
Merge branch 'master' of github.com:obezi/HackPrinceton
Merge branch 'master' of github.com:obezi/HackPrinceton
Fixed merge issues for models.py