Buggy version

Take a look at the bug
Bug fix
Fix bug so that player and enemies can move correctly.
The floor architecture is now basically set.
Merge new floor system with develop
Merge branch 'buggy' into develop