merge conflict resolved
Refactor

Squashed commit of the following:

commit 701d2f41f814850c68f9ee31bb4bcf1ef3e59053
Author: Caskman <eric.cascketta@gmail.com>
Date:   Sun May 5 18:05:34 2013 -0700

    removed commented code

commit 5a5d618e408aa8033341e15b242e83ebeca20d12
Author: Caskman <eric.cascketta@gmail.com>
Date:   Sun May 5 18:04:52 2013 -0700

    removed unused entity classes

commit 0af21dfae1076e6fb5e38fc4d66ffc5e09981f4c
Author: Caskman <eric.cascketta@gmail.com>
Date:   Sun May 5 18:00:06 2013 -0700

    changed rigidbody to convenience class and physics now uses irigidbody entities interface

commit d724e6afe79b68cc81f948792df02f794462e6cb
Author: Caskman <eric.cascketta@gmail.com>
Date:   Sun May 5 17:47:01 2013 -0700

    added constants.java

commit 96175628b252ead379d2b20d23930d86872734bc
Author: Caskman <eric.cascketta@gmail.com>
Date:   Sun May 5 17:46:41 2013 -0700

    checkpoint
Added Quadtree

Squashed commit of the following:

commit 17c9dcf69d0bde52afc035e9e873e99267ae230e
Author: Caskman <eric.cascketta@gmail.com>
Date:   Sun May 5 20:01:38 2013 -0700

    Success! quadtree optimization successful

commit 6925b5f97ec63a256e6b29d441e0276ef7313ef0
Author: Caskman <eric.cascketta@gmail.com>
Date:   Sun May 5 19:56:10 2013 -0700

    major quadtree checkpoint

commit 9aad30575cf8b8623c039df90a38fe9048b8777d
Author: Caskman <eric.cascketta@gmail.com>
Date:   Sun May 5 19:38:23 2013 -0700

    checkpoint

commit bbeb86f94fb930f4fef5ab57fb293fd53f81a1c9
Author: Caskman <eric.cascketta@gmail.com>
Date:   Sun May 5 19:09:26 2013 -0700

    tweak

commit 7d41b4f97d94564685fce5d9a891ee83365119d3
Author: Caskman <eric.cascketta@gmail.com>
Date:   Sun May 5 18:31:17 2013 -0700

    checkpoint