Adding assets for bootstrap and font-awesome
Merging in work done somewhere else