Merging.
added active element for navbar
fixed merge issue
merge
Merge branch 'master' of https://github.com/jeanqasaur/jeeves
made paper page prettier