Merge pull request #29 from SUNY-Albany-CCI-INF362/Hvccninja-Branch

Hvccninja branch
Merge pull request #32 from SUNY-Albany-CCI-INF362/master

merge latest for this week
put a z in reasources
Merge pull request #33 from SUNY-Albany-CCI-INF362/Navigation

put a z in reasources
Merge pull request #48 from SUNY-Albany-CCI-INF362/gh-pages

merging master with gh-pages