qnaire improved
Merge pull request #285 from UAhmad7/master

qnaire improved
Merge pull request #286 from SUNY-Albany-CCI-INF362/master

qnaire improved