added entypo, added icons to header, etc...
merged in icon fonts and resolved conflict