Put captcha into table
Merge branch 'master' into working
Merge pull request #5 from dedrake/working

Working