merge

Think you can ignore login.css since I just sent a pull for it a while ago