added font-awesome
Merge branch 'chris'