initial commit
Merge https://github.com/aamaslouhy/trolol