removed a dead line
Merge remote-tracking branch 'origin/master' into Matt
Merge branch 'Matt' of https://github.com/GavinOvsak/DataFish

Conflicts:
	server.coffee
Merge remote-tracking branch 'origin/master'