stupid iml file
Really horrible Water Attraction Activity
This Water Activity leaves much to be desired
Hi?
Unifnish commit
Update to WaterAttractionActivity and design
Added WaterAttractionActivity
Deleted onMenu methods, water_attration menu xml
Merge pull request #24 from palegin/water-activity

Water activity
Merge remote-tracking branch 'upstream/master'
Finish polishing up data on land details page
Style the detail action buttons
Water functionality, formatting of the Water Activity xml and Locate
Merge pull request #26 from palegin/water-functionality

Water functionality
Fix water page navigation
Fix layout issues for water
Use OKHttp for requests
Add an error handler for retrofit calls
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/src/main/java/com/codebits/codemichigan/michiganoutdoors/activities/MainActivity.java