Gitignore
Some file changes
Merge pull request #1 from james2388/Test

Test to master