Initial commit
Merge https://github.com/DeWaster/OscarBazaar