Completed step 6
Merge branch 'master' of https://github.com/kmoverall/RockPaperScissorsLizardSpock

Conflicts:
	src/com/example/rockpaperscissorslizardspock/MainActivity.java