First world and style

diff --cc include/entities.hpp
Simple merge

diff --cc main.cpp
Simple merge

diff --cc src/world.cpp
Simple merge

diff --cc storyXML/0000_SpawnHill.xml.dat
index 6d4f7b202c004557ed3be2aa1bb7f133f194f4b8,0000000000000000000000000000000000000000..6508abcf6e7cb1d6711a87e251f161130115a48d
mode 100644,000000..100644
--- 1/storyXML/0000_SpawnHill.xml.dat
--- /dev/null
+++ b/storyXML/0000_SpawnHill.xml.dat
@@@ -1,3 -1,0 +1,3 @@@
- 60
 +-300
++72
 +dOnE

diff --cc xml/playerSpawnHill1_Building1.xml
index c4def6c927261048f09bfe873d19ed08a876572e,bbf882f50c9eda90d49fa10dad8405aa6efc01f4..381f1605e3801bd95c58abc44f9dfaa6630da862
--- 1/xml/playerSpawnHill1_Building1.xml
--- 2/xml/playerSpawnHill1_Building1.xml
+++ b/xml/playerSpawnHill1_Building1.xml
@@@ -1,13 -1,11 +1,12 @@@
  <?xml version="1.0"?>
  <IndoorWorld>
        <style background="1" bgm="assets/music/theme_jazz.wav" />
 +      <link outside="playerSpawnHill1.xml"/>
  
-       <floor width="300">
-               <npc name="Bob" hasDialog="true" />
-       </floor>
+       <floor width="300" />
+       <floor width="200" start="100" />
  
-       <floor width="200" />
+       <npc name="Bob" hasDialog="true" floor="2" />
  
  </IndoorWorld>