fix for websockets
Websockets + basic API
Merge branch 'master' of https://github.com/diiceas/ShopTrip