fixed some stuff (this may not be the main branch)
testing powershell commits
Merge branches 'master', 'master', 'master' and 'master' of https://github.com/ptaffet/PDSFinal

Conflicts:
	.idea/workspace.xml