second commit
merging
Merge branch 'master' of https://github.com/paulamidey/sample_app