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

pulling changes into pages
Merge pull request #59 from SUNY-Albany-CCI-INF362/master

pulling current master into pages
Merge pull request #60 from SUNY-Albany-CCI-INF362/master

pull master to pages
Merge pull request #63 from SUNY-Albany-CCI-INF362/gh-pages

emergency (HEH)