add event test
Merge pull request #2 from cs27x/test/event_test

add event test
Merge branch 'setup' of https://github.com/cs27x/Whammy2

Conflicts:
	.settings/org.eclipse.jdt.core.prefs
Merge branch 'master' of https://github.com/cs27x/Whammy2