added modal page + city_state script for location
added modal + merge
Merge branch 'master' of https://github.com/0x01/fuckdjango