Revert files to (correct) pre-merge states

Files: js/script.js, register.php