Projectile vaugely defined, just pushing to pull
Merge branch 'master' of ssh://git@github.com/rubil4x/cmsc425.git
Merge branch 'master' of ssh://git@github.com/rubil4x/cmsc425.git
Merge branch 'master' of ssh://git@github.com/rubil4x/cmsc425.git
Sound code is now tested and debugged.
Merge branch 'master' of ssh://git@github.com/rubil4x/cmsc425.git

Conflicts (both were just renaming conflicts):
	CMSC425/src/com/piss/probe/content/res/physics/ObjectPhysicsParameterAtlasDefinition.java
	CMSC425/src/com/piss/probe/editor/registry/DefinitionEditorRegistry.java
Started working on ghost object collision for damage

Incomplete doesn't even begin to describe it.