Working lab 1.
merge branch 'server' of https://github.com/masroorhasan/454 into server