Update app and public
Merge pull request #19 from Kristories/2.0

Update app and public