Merge pull request #135 from SUNY-Albany-CCI-INF362/master

Timeline update
Merge pull request #139 from SUNY-Albany-CCI-INF362/master

update
Merge pull request #140 from SUNY-Albany-CCI-INF362/gh-pages

merge