Slight changes to app.js
Merge branch 'master' of github.com:arodrig1/disgo
Local user authentication
Merged app.js conflict