initial comit
Merge branch 'master' of github.com:samsmo/first_app