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
worked on styles.css
Merge branch 'master' of https://github.com/hack4impact/gpcah into nancy

Conflicts:
	app/static/css/styles.css
	app/templates/base.html
	app/views.py
merged to master to nancy
:
updated files
updated files
added topbar, just need to distribute spacing
added markers with black centers
removed ckeditor js from base.html
Merge pull request #22 from hack4impact/login-logout-button

Dynamic login and logout buttons + forgot password and reset password pages
added header in base.html and styled in styles.css