pulling changes
edit home icon; edit link color & line-height
fixing conflict
edit colors on headlines in FAQ
solve conflict