added NumberformatExceptions to all numbers in views
Merge branch 'master' of https://github.com/rinnly/fish into rinnly-master

Conflicts:
	src/ca/acadiau/cs/comp4583/fish/EndSessionActivity.java
	src/ca/acadiau/cs/comp4583/fish/NewSessionActivity.java
	src/ca/acadiau/cs/comp4583/fish/SubmitFishActivity.java