gemfile merge confilct
Merge branch 'master' of github.com:chuckrea/giftr
Merge branch 'master' of github.com:chuckrea/giftr
Merge branch 'master' of github.com:chuckrea/giftr
Merge branch 'master' of github.com:chuckrea/giftr
Merge branch 'master' of github.com:chuckrea/giftr
Merge branch 'master' of github.com:chuckrea/giftr
working facebook friend finder