first testing commit
Merge pull request #1 from termosfera/testing

first testing commit