started styling
fixed gemfile
fixed gemfile
Newest commit
fixed merge conflicts