Adding temporary file
Removed temp file
Merge branch 'registration'
Delete temporary file