postgis
syncing
comments
updating commuterform
oh hey an actual merge this time
Merge pull request #2 from thecristen/frontend

Frontend
removes merge artifacts in settings.py
modifies leg form-group