register page edited
conflict merge
Merge pull request #97 from KodeKracker/master

register page edited