updated the index page
Resolve merge conflict
code complete
Merge branch 'B1_Add_Demo_Files'
B1 additions
Merge branch 'master' of github.com:Tony-Hanson/mygittest into B1_Add_Demo_Files
added to test.txt