One Final Comment
Storing my files
Beginning making our game
Fixed odd merge conflict with my good code that had been deleted earlier today
change pictures and debug
Merge branch 'jerryandjack' of https://github.com/duke-compsci308-spring2013/vooga into jerryandjack
change pictures
delete unnecessary file
figure out how to load map
new streetfighterbackground
changged map background and platform
resize characters change xml properties
adding attact
merge conflicts
Merge branch 'master' of https://github.com/duke-compsci308-spring2013/vooga into jerryjackexample
Merge pull request #56 from duke-compsci308-spring2013/jerryjackexample

Merging our game onto master, I approve!