Setters in fish.java and validation
Merge branch 'master' of github.com:jerwheaton/fish