Just a commit
Secondary commit
jquery menu is now added
Merge error