random stuff
Merge branch 'master' of github.com:aleksbond/mrs-a-bakery

Conflicts:
	db/development.sqlite3
	db/schema.rb
	log/development.log