fixed da timeline
Merge pull request #237 from SUNY-Albany-CCI-INF362/js-fix-agian

fixed da timeline
Merge pull request #238 from SUNY-Albany-CCI-INF362/master

update