Fixed centering issue with home page
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/parallax.css
Merge remote-tracking branch 'origin/master'