test commit
Merge branch 'master' of https://github.com/ed-rw/test_repo

Conflicts:
	.gitignore