synching
Merge branch 'master' of https://github.com/jried31/SSWS

Conflicts:
	.DS_Store