Merge branch 'davidsBranch'
merge commit
Merge branch 'JonsBranch'

Conflicts:
	.DS_Store
Merge remote-tracking branch 'origin/davidsBranch' into JonsBranch

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

Conflicts:
	.DS_Store
fuk
fuk
Merge branch 'davidsBranch'

Conflicts:
	.DS_Store
Merge branch 'master' into davidsBranch
master merge