added figaro gem, installed figaro to work with FB keys and secrets, got rid of binding prys in various files
fixing merged conflicts with emmy
added gems specific to rspec, installed on terminal rspec and bootstrap, modified the rails_helper.rb
added two new rspect tests for index and create. test pass ;)
merging with upstream
fixed some tests
Merge pull request #25 from sandimagithub/master

rspec tests on home screen, merged code upstream locally first
Merge pull request #24 from graytmatter/master

Javascript and ajax work as desired
added login page and checks
added link to wishlist index pg, bottom bar on wishlist new pg
updated 'wishlist/new' styling, began changing 'wishlist/:id' to style differently depending on user
updated css, add item form
trying to fix merge issue
added accordion function, updated handlebars
final css tweaks before bed thurs
not sure what's up
fixed add new item button, wishlists links
added comments and begun work on claim button
Merge branch 'master' of github.com:emmya/gimme
fixed add new item button