Changed file paths for server
Merge branch 'master' of ssh://rybec.linuxd.org:443/home/pi/git/cs313