Demo app
resolved .gitignore conflicts