sunday changes
Merge branch 'master' of https://github.com/bpbuch/internship-job-tracker
more sunday changes
trying to pull
Merge pull request #32 from kevinuhrmacher/master

deleted db to eliminate merge conflict
Merge pull request #33 from afortune906/master

in class
Navbar preferences
merge conflict fix
settings page done, working on preference-less nav, quicksand