Initial Commit
Display the game, set up some state, started implementing ResourceManager
Merge pull request #1 from ramielrowe/master

Initial Game Commit
Imlementing Resource Loading
Merge pull request #2 from ramielrowe/master

ResourceLoading
temp commit
Merge
Merge branch 'master' of github.com:ACM-Game-Jam-2012/STZ

Conflicts:
	src/com/vulcastudios/TestGame.java
	src/util/ResourceManager.java
Adding some resources, transition from Splash to Load state
Merge pull request #3 from ramielrowe/master

Test Resources
Transition from load to main menu state
add map resources
Merge branch 'master' of github.com:ACM-Game-Jam-2012/STZ

Conflicts:
	resources/maps.xml
	resources/music.xml
	src/com/vulcastudios/states/LoadState.java
Basic main menu (selection not implemented)
Merge branch 'master' of github.com:ACM-Game-Jam-2012/STZ
Getters that throw exceptions when resource does not exists
Merge branch 'master' of git://github.com/ACM-Game-Jam-2012/STZ
Level loading complete
Merge branch 'master' of github.com:ACM-Game-Jam-2012/STZ

Conflicts:
	src/com/vulcastudios/TestGame.java
Merge pull request #4 from ameade/master

Add level loading