registration page complete
removed merge conflicts
Merge branch 'KodeKracker-master'