made fish move and shit
Merge remote-tracking branch 'origin/master'

Conflicts:
	coordinates/player1.txt
Merge remote-tracking branch 'origin/master'
made fish move and shit