wesley can make a girlfriend
Merge remote-tracking branch 'origin/master'

Conflicts:
	HOMEPAGE/css/layerslider.css