combining test into master

Conflicts:
	app/src/main/java/com/example/clay/myapplication/MyActivity.java
	app/src/main/res/layout/activity_my.xml
	app/src/main/res/values/strings.xml