First time using Git
Merge pull request #15 from Nastasha/master

First time using Git