Merge branch 'JonsBranch'
commit my joints
Merge remote-tracking branch 'origin/davidsBranch' into JonsBranch

Conflicts:
	.DS_Store