stuff that's done

dooonee
Merge branch 'master' of https://github.com/sloanez/BargainBAGZ

Conflicts:
Gone