Basic Collisions

Squashed commit of the following:

commit d6bca0b084a3ca3f715d7c9c01e9cb5407d11911
Author: Caskman <eric.cascketta@gmail.com>
Date:   Thu May 2 19:56:11 2013 -0700

    got basic collision working

commit 0c84a59ae02e887959a505ea6711aa535a140266
Author: Caskman <eric.cascketta@gmail.com>
Date:   Thu May 2 19:41:39 2013 -0700

    collisions are detected, resolveCollisions is being called, but visibly nothing is happening

commit 068f0ec99b982633c12d4262c9ceded9c9a62086
Author: Caskman <eric.cascketta@gmail.com>
Date:   Thu May 2 19:15:14 2013 -0700

    checkpoint

commit ac156c02c5c9de2273a8fbc77c8596ba4a1360bc
Author: Caskman <eric.cascketta@gmail.com>
Date:   Thu May 2 18:50:14 2013 -0700

    checkpoint