Create maps.html
Create maps.html
merge
Merge branch 'master' of https://github.com/hack4impact/gpcah
static map
Merge branch 'nnarang' of https://github.com/hack4impact/gpcah into nnarang

Conflicts:
	app/templates/maps.html
Merge branch 'master' of https://github.com/hack4impact/gpcah into nnarang

Conflicts:
	app/views.py
Added maps to html page
Updated map using custom.js
Updated base files
updated files
updated files
updated map using json
committ
Merge branch 'master' of https://github.com/hack4impact/gpcah into nnarang

Conflicts:
	app/views.py
Merge pull request #9 from hack4impact/nnarang

Create maps.html