Full Merge of Phoebe and Arthi's html+js files

done!