about and 404 html templates added
cleaning up templates
Merge pull request #23 from kevinuhrmacher/master

about and 404 html templates added
Merge pull request #24 from afortune906/master

cleaning up templates
nav bar
nav bar
Update home.html
Update base.html
nav bar
Merge branch 'master' of https://github.com/bpbuch/internship-job-tracker
updates
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