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
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
Set up assets for precompile into production environment and pushed coffee-rails outside
Compiled vendor assets
Removed coffeescript logic from layout file
Adding in procfile for production
Removed coffeescript logic
Moved facebook.js.erb under application folder
Merge branch 'master' of https://github.com/CoolJorcz/anatta_ly
Fixed problem with signout of homepage
Update README.md