Modified index.html
Added woo.txt
Resolved merge conflict