app.js
Merge remote branch 'origin/master'
app.js�s
Merge pull request #2 from TomasRan/master

app.js