added colspan
added text area
modiied database
Fixed conflixt
Merging new files