print statement to prove that the method works
fixed conflict

Conflicts:
	src/com/example/cranberry_glass/MainActivity.java
merge