Testing git ignore configuration
Merge branch 'DEllis'

Conflicts:
	HotPotato/res/values/strings.xml