added universal header
fixed merge conflicts with partials merge
merged the CORRECT branch with master this time