Add jQuery
Cool parallax scrolling effect
Merge conflict