Merge branch 'JonsBranch' into davidsBranch

Conflicts:
	.DS_Store
funny guy -> Jon
Merge branch 'davidsBranch'

Conflicts:
	.DS_Store