fix merge
Merge branch 'master' of github.com:stat1k/DreamStore