Merge branch 'master' of https://github.com/john1armitage/secretinspiration

Conflicts:
	.gitignore