New Version
Merge branch 'master' of https://github.com/KSpadzinski/CATScan-Associate

Conflicts:
	.DS_Store