Added font files, merged FontAwesome css