Delete timeouts, added textbox.
Merge branch 'master' of https://github.com/bradmarkshaw/HackMizzou2014
deleted timeout, added textbox