create extra sections, logo in header
fix merge conflict
changed header color, add sections
Merge branch 'master' of https://github.com/nixsticks/HappyFuntimeTrail