deleted gemfile.lock for merge
removed development files
fixed gemfile.lock
changed p color to light grey