taken out weirdness
Merge branch 'master' of https://github.com/efoord/team3-cookbook