preparing merge
merge master and fix conflicts
Delete Thumbs.db
Merge pull request #11 from Herzucco/GM_testBranch

Gm test branch