moved stylesheet link to overwrite default bootstrap settings
resolved merge conflicts
updated gemfile