merged with main#28

Open

dariorbun wants to merge 12 commits intoTeaseAI:masterfrom

dariorbun:master

Commits on May 9, 2017

new response check functions for yesornoquestion()
dariorbun
committed
fixed problems with duplicated vocabs in a single line messing things up in some occasion
dariorbun
committed
Merge remote-tracking branch 'refs/remotes/upstream/master'
dariorbun
committed

Commits on May 12, 2017

Commits on Jun 5, 2017

-moved the mean edge timer values back in the setting panel
dariorbun
committed
in the patch notes i added to my pull i forgot a bunch of stuff:
dariorbun
committed