updated strand 1 and strand 4, close to correct
more improvements to strand 1 and strand 4
Merge branch 'master' of https://github.com/skotchvail/Love-Potion-Camp into goo