initial commit
Merge github.com:breakdancingcat/Goldilocks