initial commit
Merge github.com:heliogabal/make_chocolate_fair