Merge branch 'master' of /home/christopher/Dropbox/Public/CS3240/oneDir-group14 with conflicts.
Fixing server calls.