Midterm
Merge pull request #68 from bequinn/master

Midterm (The fish project)