For server
Merge branch 'assignment3' of https://github.com/jasonpeng/cs3246-assignment2 into assignment3