Add font css, added a test function to add text, did the font mapping n JS
fixed merge conflict