Initial commit
beta changes
Merge github.com:TND23/Trolle_app