more merge
Merge branch 'master' of https://github.com/bpbuch/internship-job-tracker
merge prep
Merge branch 'master' of https://github.com/bpbuch/internship-job-tracker

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

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

new user list page