Reset survey
Merge branch 'master' of ssh://rybec.linuxd.org:443/home/pi/git/cs313

Wierd stuff with changes
Merge branch 'master' of ssh://rybec.linuxd.org:443/home/pi/git/cs313
Merge branch 'master' of ssh://rybec.linuxd.org:443/home/pi/git/cs313
Merge branch 'master' of ssh://rybec.linuxd.org:443/home/pi/git/cs313
Merge branch 'master' of ssh://rybec.linuxd.org:443/home/pi/git/cs313
Removed data file
Merge branch 'master' of ssh://rybec.linuxd.org:443/home/pi/git/cs313
Removed votes.txt