removing remote version of DS_store

after adding it to .gitignore file
removing remote version of Gemfile.lock

after adding it to .gitignore file
created a .gitignore file
Merge branch 'master' of https://github.com/fiddler-crabs-2014/ConsciousConsumer
Merge branch 'master' of https://github.com/keaty/ConsciousConsumer
Merge pull request #7 from keaty/master

created a .gitignore file
gemfile