first commit
added welcome and apps controllers and set up apps model
handled merge conflict on README.md
merge conflict
Merge branch 'master' of github.com:vanderhoop/meta_pinger