init
name
Merge branch 'master' of https://github.com/cweathernet/AndroidApp

Conflicts:
	res/values/strings.xml