ffdsafdsafdsa
Revert "Fixed upgardeactivity after merge"

This reverts commit 6feee7129deb246b52ce5477ff305217fef45ad0.

Conflicts:
	app/src/main/java/edu/uark/csce/tilebreaker/UpgradeActivity.java