Merge pull request #49 from CTFigueroa/master

Added retiree data to data.js file
added data
merge conflict fix
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