Moved more collision code to collision object. Updated graphics code.

RUN RESOURCE DISTRIBUTER
merge conflict