Merge branch 'Costea_m' of github.com:Daiver13/flo-youngblood
Merge remote-tracking branch 'origin/andrew'

Conflicts:
	header.php
Merge remote-tracking branch 'origin/andrew'
Merge remote-tracking branch 'origin/master'