Add amistad gem for friend stuff
add amistad gem
Merge branches 'amistad' and 'master' into amistad
trying to get an error
friend gem
updated schema and gemlock file to work with new gem from alix
merged stuff for routes.db
updated css styles to make microposts look better and removed redundant user link in the feed_item.html.erb file