got company IDs working

Committing so I don't fuck it up again
Merge branch 'master' of https://github.com/kelleyb/SwagTracker

Conflicts:
	db/schema.rb