2 buttons -> 1 button
events almost completed, updated rendering of events
Merge pull request #33 from tlwr/master

Events & Rendering of Events