port change..oops forgot one line
History Position
Preparing for commit
Merge branch 'serverTesting' of https://github.com/arikalfus/OperationNightlife into serverTesting
Merge branch 'master' of https://github.com/arikalfus/OperationNightlife
Changed back to our default port number
Merge branch 'master' of https://github.com/arikalfus/OperationNightlife
Modularized server service.
Removed alerts
Fixed historyPosition collection
Updated server historyPositions
Updated server
Updates server
Improved server change
got add member to group to workgit add .!
Editing main
working on conflicts
test
fixing lots of conflicts
Server functions