finished the ordered events table
resolved conflicts
Merge pull request #23 from BYUI-Web/ordered-events-table

finished the ordered events table