Added the skeleton for the demo app.
Resolved merge conflict