Adapt webapp to new logic
Merge pull request #13 from TooAngel/master

Adapt webapp to new logic