Adding tests to Database controller
Add code_statistic__test.rb file
solving conflicts
Merge branch 'master' of github.com:rails/conductor into test
Fix gemfile_test.rb
Fix database_test.rb
Merge pull request #11 from rails/test

Tests for Gemfile and Database models