installed font-awesome
Merged kevin's stuff