(mostly) complete river data class
river data collection and processing - initial version
updated manifest and layouts
Merge branch 'master' of https://github.com/QuasimodoNZ/Bluno-WaiNZ

Conflicts:
	BlunoBasicDemo/src/com/example/blunobasicdemo/RiverHealthCalculator.java
Merge branch 'development' into feature/Scott

Conflicts:
	BlunoBasicDemo/res/values/strings.xml
	BlunoBasicDemo/src/com/example/blunobasicdemo/MainActivity.java
Fixed some dumb mistakes
Merge branches 'master' and 'master' of https://github.com/QuasimodoNZ/Bluno-WaiNZ
Merge branch 'master' into feature/layouts
work
google things
Merge branch 'feature/layouts' into feature/Results

Conflicts:
	BlunoBasicDemo/AndroidManifest.xml
	BlunoBasicDemo/res/values/strings.xml