merge with google web starter kit