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

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

Initial Commit