add changes
merge bugs..
merge deve
Merge branch 'master' of github.com:KIDJourney/steamtraderep