registration functionality is completed
marge conflict removed
Merge branch 'master' of https://github.com/cprasenj/ADDA