Merged changes
working through compilation errors
t push
kay
djua
current condition
circular dependency?
Begin refactoring to objective C
added PCGPair test suite
adding PCGRule test suite
Finish TestPCGRule unit test
We're both rock solid
started PCGEntity test suite
fixed project file
Finished most of the game. Minor tweaks and feature adds remain
Merge remote-tracking branch 'origin/Bret' into Integration
Merge conflict resolved.
Changed entity class and updated unit test
Completed merge, tests pass YAY
WIP