Merge branch 'Geoffs_WIP'
You can win now

thats new
Added more potions
Merge conflicts
Changes

oh no
Merge branch 'master' into Geoffs_WIP