renamed server.go to main.go
Merge remote-tracking branch 'origin/master'