gemfile merge conflict
fix gemfile merge conflict
User rerouted to a non-error page when the search results are nil
Merge pull request #60 from alexung/alex_save_button

Alex save button