Merge branch 'master' of https://github.com/coagmano/LDI-ProjectHub

Conflicts:
includes/navbar.php
index.php
Conflict fix