jared here lol
Merge branch 'develop' of https://github.com/why1991/HelloAndroid into develop

Conflicts:
	HelloWorld/res/values/strings.xml