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

Basicpage
sectors uploaded
fixed merge conflicts
fixed Tai merges
Merge branch 'map'
Merge branch 'master' of github.com:iliastsangaris/Argos into map
centered map