Added an Events page and crud functionality
Resolved conflicts