Some more shitmixing
Merge branch 'master' of github.com:7oi/whoopshop