Added cancel buttons to a couple of screens
Added option to take picture of the fish, and made the fish type screen look a little better
Initial commit of this branch
Merge pull request #6 from polaris8920/new-tagged-option

New tagged option