Added Gemfile.lock:
Merge remote-tracking branch 'origin/master'
Added bootstrap and SASS