Added MarketScreen and its leave button
merged
merging issues
merged
Fixed .class inclusion