cleaned floor file, public to private
Merge branch 'dev' of https://github.com/TylerSandman/cc3k into dev