working on events
Merge branch 'JonsBranch'

Conflicts:
	.DS_Store