start fixing
city page fix
map fix
Delete tracker.db
org updates
updates
Merge branch 'master' of https://github.com/bpbuch/internship-job-tracker

Conflicts:
	.DS_Store
	tracker/interactive_app/templates/interactive_app/home.html
	tracker/interactive_app/templates/interactive_app/organization.html
	tracker/interactive_app/templates/interactive_app/user_list.html
	tracker/interactive_app/views.py
	tracker/tracker.db
	tracker/tracker/templates/base.html
merge2