gitignore
gitignore

Merge branch 'master' of https://github.com/hughjonesd/experiment1

Conflicts:
	.gitignore