added bootsrap for rails project.
fixed merge conflicts
Merge pull request #5 from chinenyem/master

added bootstrap