Adding bootstrap static files.
Adding updated Gemfile.lock file.
Merge remote-tracking branch 'upstream/master'
Merge pull request #11 from lisafrench/master

Adding static bootstrap files