Vasea 2
Merge branch 'master' of github.com:Flositesgit/flo-youngblood
Merge branch 'master' of github.com:Flositesgit/flo-youngblood

Conflicts:
	header.php
rebase commit