Home Parallax - all CSS - in works
Resolve Merge
Resolve Merge

Conflicts:
	wp-content/themes/bones/library/css/style.css