string1->string10
Merge branch 'master' of
https://github.com/slc-cs-summer-research/gitTest

Conflicts:
	gitTest/src/com/example/gittest/MainActivity.java
Merge branch 'master' of https://github.com/slc-cs-summer-research/gitTest
sloan changed the string.xml
Merge branch 'master' of
https://github.com/slc-cs-summer-research/gitTest

Conflicts:
	gitTest/src/com/example/gittest/MainActivity.java