Changing Environmental Objects
Merge branch 'jerryandjack' of https://github.com/duke-compsci308-spring2013/vooga into jerryandjack
Added attack rules and jump rules
Adding new conditions, now need to add menus
Continuing working on menus
Merge branch 'jerryandjack' of https://github.com/duke-compsci308-spring2013/vooga into jerryandjack
More menu work and fixing attacks
Finished game with sweeet options
Fixed final merges
For some reason got a merge conflict with OneVOne controller, should not have happened and didn't mean to change anything
Have a working version of our game
Merge branch 'master' of https://github.com/duke-compsci308-spring2013/vooga into jerryjackexample
Merge pull request #62 from duke-compsci308-spring2013/jerryjackexample

needs a little refactoring, but is functional