first commit
Merge branch 'master' of github.com:mcbarret/first_app

problem getting first commit working