Re-configuring database.yml file to work with local settings
Styling the site and updating search query method
Fixing merge issues