message
gitignore changes
a few changes
city and city list
trying to pull new organizations
update
minor changes
trying to pull upstream
updates on organization, organization list, city list
changes to city page, etc.
added twitter on organization
commented on css file
la da da
Merge pull request #19 from afortune906/master

Are there any problems?
bryans changes
Merge pull request #20 from afortune906/master

brians changes
Merge branch 'master' of https://github.com/bpbuch/internship-job-tracker

Conflicts:
	tracker/tracker.db
beginnings of a mapbox map