html updates
update
master merge update
merge of table
second commit
resolved merge conflicts in style.scss