Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
changes in menu
Merge pull request #5 from arnulfo4jc/master

refactored navbar