pre-merge commit
Merge branch 'master' of https://github.com/JunLiang/ce6378_project2.git
Changes to how to sync server writes