Used jquery to stop the form from being submitted
fixed merging conflict
fixed merging conflict
Merge branch 'master' of https://github.com/emashliles/CreativeCaptcha