mergge

diff --cc include/entities.h
Simple merge

diff --cc include/world.h
index 0e26ed9eb23fd461baa7caa6b8b53f7d015f9cfa,43da6fc923dd8651c9344ba83081c84748201cfd..48ab40969a8f2810f510e605a453a927b135953e
--- 1/include/world.h
--- 2/include/world.h
+++ b/include/world.h
@@@ -342,7 -351,13 +351,13 @@@ public
         * playable.
         */
        
 -      void setBGM(const char *path);
 +      void setBGM(std::string path);
+ 
+       /**
+        *      Sets the worlds style folder
+        */
+ 
+       void setStyle(const char* pre); 
        
        /**
         * Plays/stops this world's BGM. If `prev` is not NULL, that world's BGM

diff --cc src/entities.cpp
Simple merge

diff --cc src/ui.cpp
Simple merge

diff --cc src/world.cpp
Simple merge