merging
Merge branch 'master' of http://github.com/KFanPrecalcMan/heartattack

Conflicts:
	src/heartattack/MainMenuState.java
store is semi working now.