pulling
fixing merge conflicts
merge
fixed merge conflict
set up basic routes/view
Merge pull request #4 from iliastsangaris/basicpage

Basicpage
adding Esri map
set up env vars
setting up basic call
sectors uploaded
ESRI map centered on US
fixed merge conflicts
setting up basic calls and search
models created
Esri Map
setting up searsh
Merge branch 'search'
fixed Tai merges
Merge branch 'map'
merge