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

merge master into pages, but actually this time
Merge pull request #176 from SUNY-Albany-CCI-INF362/master

merging master into pages
Merge pull request #182 from SUNY-Albany-CCI-INF362/master

merging latest changes into gh-pages
Merge pull request #189 from SUNY-Albany-CCI-INF362/gh-pages

Pushing to pages