Merge pull request #1 from DarkSamurai/develop

First addition of desription of folders. Note: these will be removed
Merge pull request #2 from DarkSamurai/master

Merge pull request #1 from DarkSamurai/develop