Changed Proto and server.conf
Merge branch 'master' of https://github.com/sharmaprateek/cmpe275p1