demo app created
conflicts resolved in .gitignore