All changes from today

Probably not broken..
Merge branch 'master' of https://github.com/ConnorHolyday/SellMyGadgets