SCSS changes
merge changes
Ha
Merge pull request #96 from SUNY-Albany-CCI-INF362/nav

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

css changes