Git fixes.
Merge branch 'master' of https://github.com/peter-ineson/Demo

Conflicts:
	.gitignore