Initial Commit
Merge branch 'master' of github.com:JohnD-oh/merge_clash_demo
adding demo text