initial commit
startServer and constructor
Merge origin/master