Committing before adding jquery-parallax

Signed-off-by: Arné Schreuder <arne@consulta.co.za>
Resolved conflicts

Signed-off-by: Arné Schreuder <arne@consulta.co.za>