Added PHP stuff for registration form
fixed merge errors