created server project
Merge remote-tracking branch 'origin/ben'