Trump and Congress Reach Short-Term Deal to End Government Shutdown