adding tabularx
merge conflicts fixed
more awesome tables, thanks @gidden.