fix bugs
fix conflict
Merge pull request #59 from delihiros/event-history

Event history