Load
Merge branch 'master' of https://github.com/tmmtsmith/Powershell

Conflicts:
	.gitignore