adding bootstrap gems
Merge branch 'master' of github.com:jbmilgrom/social_pocket
bootstrap working
merge conflict resolution_1
splash page
merge conflicts resolved
Merge pull request #1 from NSCHUB01/master

Merge conflict resolved