Got Mario/Platform collision working w/ interfaces.
Fixed merge conflict in Mario.java