Initial commit
Clean up event client
Merge branch 'master' of https://github.com/tjayr/hackathon

Conflicts:
	.gitignore