Add Logout file
Finished Log Out script
Fix merge conflict