Before jon merges
Merge remote-tracking branch 'origin/davidsBranch' into JonsBranch

Conflicts:
	.DS_Store
Events working well so far
Merge branch 'JonsBranch'

Conflicts:
	.DS_Store