Add test files
Add .gitignore
Merge branch 'testbranch'