added details to user list page
Merge branch 'master' of https://github.com/bpbuch/internship-job-tracker
Merge branch 'master' of https://github.com/bpbuch/internship-job-tracker
Merge branch 'master' of https://github.com/bpbuch/internship-job-tracker
mapbox api map in progress
Merge branch 'master' of https://github.com/bpbuch/internship-job-tracker

Conflicts:
	tracker/tracker.db
beginnings of a mapbox map
Merge branch 'master' of https://github.com/bpbuch/internship-job-tracker

Conflicts:
	tracker/interactive_app/templates/interactive_app/home.html
	tracker/interactive_app/templates/interactive_app/organization.html
	tracker/tracker.db
	tracker/tracker/templates/base.html
basic style changes, working in map data
more style changes, fixing map nav
Merge branch 'master' of https://github.com/bpbuch/internship-job-tracker

Conflicts:
	tracker/interactive_app/templates/interactive_app/home.html
	tracker/tracker.db
	tracker/tracker/static_media/js/site.js
	tracker/tracker/templates/base.html
working map with links, hardcode of shame
map with links, footer now at bottom of page but not responsive
Merge branch 'master' of https://github.com/bpbuch/internship-job-tracker

Conflicts:
	tracker/tracker.db
	tracker/tracker/static_media/css/home.css
	tracker/tracker/static_media/js/site.js
	tracker/tracker/templates/base.html
working toward dymanic map
Merge branch 'master' of https://github.com/bpbuch/internship-job-tracker

Conflicts:
	tracker/interactive_app/templates/interactive_app/home.html
	tracker/tracker.db
filters on user list in place, now need to add JS quicksand functionality
Merge branch 'master' of https://github.com/bpbuch/internship-job-tracker
changing from django geojson to ajax
Merge branch 'master' of https://github.com/bpbuch/internship-job-tracker

Conflicts:
	tracker/tracker.db
	tracker/tracker/templates/base.html