initial work on server
merge conflicts
Merge branch 'development' of github.com:/tapiSoft/tapiBombers into development