Fix html merge conflict, remove git conflict markers
Fix html merge conflict, remove git conflict markers
remove unused old style.css file
Update all files, replace old style.css with calculator.css
Clean full upload: split html/css/js carpet calculator
Initial commit