Trip Hub functionality: Add/Remove trips to/from file. Trips displayed and selected from a navigation drawer. Drawer is updated based on add/remove.
best commit of all time
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/res/values/strings.xml