Ignore this
Merge branch 'master' of https://github.com/araymer/SomeTowerDefense.git

Conflicts:
	src/Structures/BaseDesertUprising.java
Merge branch 'master' of https://github.com/araymer/SomeTowerDefense.git
Fixed the Resource Panel so that it's in the JFrame and made some GUI
logic changes using a JLayeredPane and using better CardLayout
organization.
Fixed JMenuBar so that it stays throughout the game.
Merge branch 'master' of https://github.com/araymer/SomeTowerDefense.git

Conflicts:
	bin/Model/Map.class
	src/Controller/GameController.java
	src/Model/Player.java
	src/View/GameGUI.java
	src/View/ResourcePanel.java