regsitration page fully completes
conflict solved
Merge pull request #132 from KodeKracker/master

regsitration page fully completes