Fixed Class Conflict
Merge pull request #191 from SUNY-Albany-CCI-INF362/Hompage-Buttons

Fixed Class Conflict
Added Questionnaire Button on navigation.

Added Questionnaire Button on navigation.
Merge pull request #192 from SUNY-Albany-CCI-INF362/master

Fixed Class Conflict