run migrate
Merge branch 'master' of github.com:kaaterskil/bobsbagels

Conflicts:
	db/schema.rb