Events parallax working properly, but has extra space at the bottom
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/jsLibraryMappings.xml
Events parallax working properly, but has extra space at the bottom