Merge branch 'mirceakitsune/shotgun_cannon' into 'master'
-rw-r--r-- 4655 .gitattributes
-rw-r--r-- 2762 README.txt
drwxr-xr-x - demos
drwxr-xr-x - env
drwxr-xr-x - fonts
drwxr-xr-x - gfx
drwxr-xr-x - models
drwxr-xr-x - sound
drwxr-xr-x - textures