getting the lastest yo
Merge branch 'SamsMiracle2' of https://github.com/sschwebach/Stone-Android into SamsMiracle2

Conflicts:
	src/com/unicornpower/stone/MainActivity.java