My version of nicer date/time solution
Resolved merge conflict in flights/index.html.erb