more merge
Merge branch 'master' of https://github.com/bpbuch/internship-job-tracker
small changes to the base nav
Merge pull request #13 from afortune906/master

not too many changes, some city stuff
merge prep
Merge branch 'master' of https://github.com/bpbuch/internship-job-tracker

Conflicts:
	tracker/tracker.db
Merge pull request #14 from kevinuhrmacher/master

small changes to the base nav
Merge branch 'master' of https://github.com/bpbuch/internship-job-tracker

Conflicts:
	config.codekit
remove codekit
message
merging gitignore
gitignore changes
new user list page
Merge pull request #15 from anniedaniel/master

new user list page
a few changes
city and city list
organization.json unicode fix
trying to pull new organizations
update
update models views and urls