a
Merge branch 'master' of https://github.com/Picsou/Duo-Portal
added scrolling bars