Formatted for hike list
Merge branch 'master' of https://github.com/story-makers/AndroidProject