Fix API calls on both client and server sides
Merge branch 'master' of github.com:eecs481group21/LivingRoomVS