Merge branch 'master' of github.com:Neamar/kingdoms into hugo
improve random_sex
improve random between
jQuery weird bug
Rename script to scripts
Merge branch 'hugo' of github.com:Neamar/kingdoms
Add cancellable tests (fix #14)
PEP8
Documentation for triggers
Add functions for event logic (fix #10)