Modified the .gitignore file
Merge branch 'master' of github.com:wfbobzien/sample_app2