Initial commit
Merge branch 'master' of github.com:stanleyalston/sampleapp2