Merge pull request #10 from Stephanie-Chou/restart

jsx
add friends works
bootstrap gem
bootstrap works