Added events category as well as an iterator in index.html for events.
Fixed merge conflicts.