I misordered one line when doing manual diffs
Minor AABB refactor, colors in config now
Removed an override on add collision boxes to list, it was
just a call to super
Merge pull request #4 from ft975/master

Switched the colours over to a config file