made tests not break everything
Merge branch 'master' of github.com:eliellis/brunch-bacon-pancakes