Changes timeouts and adjusts attack messages
Merge pull request #21 from slkennedy/sara-master

Changes timeouts and adjusts attack messages