Merge branch 'master' of github.com:theparticleman/LegacyCodeExample

Conflicts:
	.gitignore
Merge branch 'master' of github.com:theparticleman/LegacyCodeExample