added things
merge
Merge branch 'registration6'