messed with login a little
Merge branch 'testbranch' of https://github.com/Anggva/Data-Modelling into testbranch
my shit works
just some updates
fixed merging issues