Merge pull request #20 from slkennedy/sara-master

Sara master
Merge pull request #21 from slkennedy/sara-master

Changes timeouts and adjusts attack messages
adds name param to gameover
merges w/ upstream master
Merge pull request #22 from NicerHugs/master

adds name to gameover
comments about deferred stuff
Merge pull request #23 from NicerHugs/master

comments about deferred stuff
Organizes JS code