working on events
Before jon merges
Merge branch 'JonsBranch' into davidsBranch

Conflicts:
	.DS_Store