merge
Merge branch 'master' of https://github.com/saumyadalal/Bazaar-2.0
changed trading button color
Merge branch 'master' of https://github.com/saumyadalal/Bazaar-2.0
changed lots of colors
Merge branch 'master' of https://github.com/saumyadalal/Bazaar-2.0