Merge pull request #51 from natalie03/master

Fixed merge conflict
data
updatedmergeconflict
Merge pull request #52 from chinenyem/master

fixed merge conflict. my data
updated js
updated merge conflict
Merge pull request #53 from CTFigueroa/master

Updated merge conflict
added new switch cases in events.js
Merge pull request #54 from CTFigueroa/master

added new switch cases in events.js
finished switch stuff