adding icons
added about, organization button
trying to make this work
monday changes
settings page styling
merge conflict fix
settings page done, working on preference-less nav, quicksand
finished about page, updates on organization twitter
Merge pull request #35 from kevinuhrmacher/master

settings done, working on nav and quicksand on userlist
trying to get rid of merge conflicts
Merge pull request #37 from afortune906/master

trying to get rid of merge conflicts
added job posting
fixes
Merge branch 'master' of https://github.com/bpbuch/internship-job-tracker

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