Added a few more screens, renamed old files to something more descriptive
Merge branch 'master' of https://github.com/polaris8920/track-my-fish
Added cancel buttons to a couple of screens
Merge branch 'master' of https://github.com/polaris8920/track-my-fish
Added a more elegant way of detecting GPS. Updated a few XML files for nicer looking screens.
Added option to take picture of the fish, and made the fish type screen look a little better
Mike's Thursday night changes.
A massive merge of Louren's camera additions and Mike's everything else.
Fixed some minor changes that where deleted on the merge
Fixed some more minor changes
Added a total amound of fish option, on the main session screen
Changed the done and cancel buttons they should not overlap anymore
Merge pull request #7 from polaris8920/tripple-merge-lol

Final merge?