init repo
Merge branch 'master' of https://github.com/preetsethi/first_app

stupid git; merging