resolving a little conflict
Merge pull request #29 from saulelis/top_menu

resolving a little conflict