back on the right track, nav work coming
april 16 changes
login update
Merge pull request #21 from kevinuhrmacher/master

back on the right track, nav work coming
Merge pull request #22 from afortune906/master

april 16 changes
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