Merge remote branch 'refs/remotes/origin/divVerent/rising-of-the-phoenix'
-rw-r--r-- 3680 .gitattributes
-rw-r--r-- 2762 README.txt
drwxr-xr-x - env
drwxr-xr-x - gfx
drwxr-xr-x - models
drwxr-xr-x - sound
drwxr-xr-x - textures