Locally host JS/CSS files
Merge branches