Added trap and custom text
Merge branch 'master' of https://github.com/mianuddin/csfinals