Removed the firefox stuff, Now this repo is just the website
Fixed merge