closes #32, updates font-awesome
merge with tan changes and apply font-awesome changes and fixes