Merge pull request #6 from darkfadr/staging

Staging
was missing navbar condition; bug fix
Merge branch 'master' of https://github.com/darkfadr/upme into content
changed format to if: endif;
Merge pull request #7 from darkfadr/content

Bug Fix