registration page complete
removed merge conflicts
Merge branch 'KodeKracker-master'
Merge pull request #125 from rishy/master

merge conflict removed in kodekracker-repo