js updates
updated merge conflict
updates
Merge branch 'master' of github.com:tiy-chs-q4-fee/buck.it
Merge branch 'master' of github.com:tiy-chs-q4-fee/buck.it
Merge pull request #48 from natalie03/master

data structure
merge conflict resolutions
Merge branch 'master' of github.com:tiy-chs-q4-fee/buck.it
added data for retiree variable in data.js
Merge pull request #49 from CTFigueroa/master

Added retiree data to data.js file
merge conflict fix