adding icons
Update mapInfo.js
"pushing in icons"Merge branch 'master' of https://github.com/hariananth/streetstories
fixing title of main page and adding indoors piece
merge conflict
updating nav stuff
Merge branch 'master' of https://github.com/hariananth/streetstories
merge conflict
Update mapInfo.js
pulling location specific stuff in to the html file to be able to add media in context maps
Merge branch 'master' of https://github.com/hariananth/streetstories
fix main js to use new json keys
Merge branch 'master' of github.com:hariananth/streetstories
Fixing json object name
Merge branch 'master' of github.com:hariananth/streetstories
Merge branch 'master' of github.com:hariananth/streetstories
fixing map loading
Merge branch 'master' of github.com:hariananth/streetstories
damn it
added a team page stub