layout update and map
Merge branch 'master' of https://github.com/whyu/wdi_project_2
Merge branch 'master' of https://github.com/whyu/wdi_project_2 into development
update
updated index
Merge branch 'development'
Merge branch 'master' of https://github.com/whyu/wdi_project_2 into development
load page
Merge branch 'development'
Merge branch 'master' of https://github.com/whyu/wdi_project_2 into development
updated js and map