spaces instead of tabs.
 4 spaces for html files and 2 spaces for js files
fix conflicts