Add Font Awesome
Fix git conflicts