shit

diff --cc Changelog
index 0a4490494520c80b5fec3a10eea40a4e80274c18,c894c5c788d2224795e7c6b62cd734a6dfcc512a..18b918eb5b983dc9269d35a677769536df6cc8cc
--- 1/Changelog
--- 2/Changelog
+++ b/Changelog
@@@ -411,4 -408,15 +411,19 @@@
        - imrpoved BGM handling
        - continued work on particles, made a fountain
        - added sanic
++<<<<<<< HEAD
 +>>>>>>> 43bbcf02fd5e4e69a9aa521fa4cd572cc8675cf3
++=======
+       
+       ~ Broke 5000 lines of code/doc, now with some file Doxygen'd
+ 
+ 12/14/2015:
+ ===========
+ 
+       - Re-implemented Arena
+               added door mob for exit
+               added white flash + sound transition
+       - fixed fading bugs
+       - continued fixing general game bugs
+       - fixed structure spawn issues
++>>>>>>> e67bfdde0b7e15ac6bc29993a92a89a844474554

diff --cc src/gameplay.cpp
Simple merge