Ignore config/database.yml
Track gem binaries as rails 4 demands
Merge pull request #4 from webdevtalks/ignore-database-config-file

Ignore config/database.yml
Add capybara + poltergeist for RSpec integration tests

[skip ci]
Add Dotenv gem to manage configuration variables

[skip ci]
Merge pull request #5 from webdevtalks/user-dotenv-for-environment-variables

Add Dotenv gem to manage configuration variables
Merge pull request #6 from webdevtalks/track-gem-binaries

Track gem binaries as rails 4 demands
Merge pull request #7 from webdevtalks/integration-specs

Add capybara + poltergeist for RSpec integration tests
Add simplecov for test coverage reports
Merge pull request #8 from webdevtalks/test-coverage

Add simplecov for test coverage reports
Add debugging tools

- awesome_print
- debugger
- pry-rails

[ci skip]

Conflicts:
	Gemfile
Merge pull request #9 from webdevtalks/debug-tools

Add debugging tools
Add testing tools

- fabrication
- faker

[ci skip]

Conflicts:
	Gemfile
	Gemfile.lock
Merge pull request #10 from webdevtalks/test-tools

Add testing tools
Update Travis CI badge with new repo name
Because it never gets old update things
Update ruby version in travis config file
Merge pull request #11 from webdevtalks/update-travis-configfile

Update Travis CI badge with new repo name
Merge pull request #12 from webdevtalks/update-all-the-things

Because it never gets old update things
Merge branch 'master' into fix_conflicts_development

Conflicts:
	Gemfile
	Gemfile.lock
	spec/spec_helper.rb