Modified login, register/Added unlinked register.php for possible future use
Merge branch 'James'