Merge remote-tracking branch 'origin/dev'
Added empty circle.yml
Merge branch 'dev' of https://github.com/johnku1/betty into orgin/dev
Added info for Circle.yml
Fixed the Gemfile.lock
Another fix for my Gemfile.lock.
Merge pull request #141 from johnku1/dev

Circle.yml file added.