render search results list
fix the conflicts
Adding unit tests
Merge branch 'master' of https://github.com/maggiemu/flight-bookings