The economy tab works
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/spacegame/pennappsx/GameActivity.java
Merge remote-tracking branch 'origin/master'
The economy tab works