working still
Merge branch 'master' into ws_mobile
Merge branch 'master' into ws_mobile
testing
Merge pull request #37 from ieatkimchi/ws_mobile

Ws mobile
fixed merge conflict