canges in test.xml
resolving conflicts
Merge pull request #5 from zanox/demo_branch_2

Demo branch 2