server stuff
server working
merge
Merge branch 'master' of github.com:spotco/Shoot3Kill
working server, merged