added colspan
added support for colspan in tables
added bordering to tables