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

pull
pad to lcons
Merge pull request #122 from SUNY-Albany-CCI-INF362/master

pull