test
Merge branch 'master' of https://github.com/Cadroctet/Informer

Conflicts:
LICENSE
Conflict resolving