my first commit
Merge branch 'master' of github.com:tstancheva/Sample1