Merge pull request #1 from Stolz/master

Update from original
Update README.md

Typo
Merge pull request #20 from jotafurtado/master

Fixing a typo
Merge branch 'master' of github.com:Stolz/Assets
Merge branch 'develop'
Merge branch 'develop' of github.com:Stolz/Assets into develop