Minor fixes and resolved merge conflicts

Merge branch 'master' of https://github.com/googlei18n/incremental-fonts
Minor fixes to make updateFont function works	
Updated html file to use js	
Merge remote-tracking branch 'upstream/master'