Start a new branch
Add list option
Add navigate up
Complete the 16th chapter
Merge branch 'develop'

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