Merge pull request #1 from GiantSusus/master

Login and register
Merge pull request #2 from GiantSusus/johans

Merge pull request #1 from GiantSusus/master