Fixed Event.getEvent()
Merge branch 'actions' of github.com:cool-beans/Team65_buffer into actions
Fixed Event.getEvent() and merge conflicts