Changes based on feedback
Merge branch 'master' of https://github.com/Clevara/Clevara.github.io