Demo page added
Fix commit
Conflicts resolved