Initial commit
+merging
Merge branch 'master' of https://github.com/alizhd/demo_app