working on bug with header.php
fixed header merge conflict
fixing print_r issue
fixing print_r issue
Merge branch 'layout' into dev