First commit
Merge pull request #2 from becka1399/master

First commit