fdsa
Merge branch 'master' of github.com:applekey/wizard
socket stuff running, but not wking