Adding files
Merge https://github.com/RowanDoble/TestRepo

Conflicts:
	.gitignore