Adds attack alerts and timeouts
Merge branch 'master' into sara-master
Merge pull request #20 from slkennedy/sara-master

Sara master