Test my own branch.
Merge pull request #1 from adam6806/Adam

Test my own branch.
Merge branch 'Dylan'

Conflicts:
	res/values/strings.xml