Fixing gemfile.lock merge conflicts
Fixing merge conflicts
Merge branch 'master' of https://github.com/CoolJorcz/anatta_ly
Merge branch 'master' of https://github.com/CoolJorcz/anatta_ly
Update README.md
Fixed merge conflict
Modfied gemfile and bootstrap to fix merge conflict
Removed superflous files from public dir
Added test images for homepage
Modifed padding on body content
Added styling for layout and index

Adjusted responsiveness of nav bar and body
Added footer to layout
Added images and styled on index page
Centered footer
Changed main background color
Fixed date selection for requests
Fixed datetime on sharing and borrowing
Refactored borrowing and sharing capabilities and implemented index view
Added a shuffle to friend items listed on homepage
Fixed problem with signout of homepage, refactored code from welcome controller to friend model
Added figaro to gemfile
Implemented search functionality into user collections and index pages