Comment 2
Comment 3
Merge branch 'master' of github.com:Daiver13/flo-youngblood into Oleg
delete social div
Merge branch 'master' into Oleg

Conflicts:
	header.php