updated popshack features
Merge pull request #37 from PopShack/popshackFeatures17Jul

updated popshack features