Merging Git For Android Developers Part 5