#4 navigation
Merge pull request #44 from SUNY-Albany-CCI-INF362/alp

#4 navigation
Merge pull request #45 from SUNY-Albany-CCI-INF362/master

Merge master into gh-pages