Adding in master for test
Fixing git merge conflicts
Fixing git merge conflicts
Adding sample automation scripts for demo