diff --git a/.codeclimate.yml b/.codeclimate.yml
index 31a56f4..310cd0f 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -1,8 +1,5 @@
-languages:
-   Ruby: true
-   JavaScript: true
-   Python: true
-   PHP: false
-exclude_paths:
-- "test/*"
-- "app/assets/javascripts/*js"
+engines:
+  rubocop:
+    enabled: true
+    
+#test commit
diff --git a/.travis.yml b/.travis.yml
index 23a0abe..f63dab6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,5 @@
 language: ruby
 rvm:
   - 2.2.2
+
+#test commit
diff --git a/app/.spec.js b/app/.spec.js
new file mode 100644
index 0000000..f1e90cb
--- /dev/null
+++ b/app/.spec.js
@@ -0,0 +1,20 @@
+describe('angularjs homepage', function() {
+  it('should greet the named user', function() {
+    // Load the AngularJS homepage.
+    browser.get('http://www.angularjs.org');
+
+    // Find the element with ng-model matching 'yourName' - this will
+    // find the <input type="text" ng-model="yourName"/> element - and then
+    // type 'Julie' into it.
+    element(by.model('yourName')).sendKeys('Julie');
+
+    // Find the element with binding matching 'yourName' - this will
+    // find the <h1>Hello {{yourName}}!</h1> element.
+    var greeting = element(by.binding('yourName'));
+
+    // Assert that the text element has the expected value.
+    // Protractor patches 'expect' to understand promises.
+
+    expect(greeting.getText()).toEqual('Hello Julie!');
+  });
+});
diff --git a/app/assets/.spec.js b/app/assets/.spec.js
new file mode 100644
index 0000000..f1e90cb
--- /dev/null
+++ b/app/assets/.spec.js
@@ -0,0 +1,20 @@
+describe('angularjs homepage', function() {
+  it('should greet the named user', function() {
+    // Load the AngularJS homepage.
+    browser.get('http://www.angularjs.org');
+
+    // Find the element with ng-model matching 'yourName' - this will
+    // find the <input type="text" ng-model="yourName"/> element - and then
+    // type 'Julie' into it.
+    element(by.model('yourName')).sendKeys('Julie');
+
+    // Find the element with binding matching 'yourName' - this will
+    // find the <h1>Hello {{yourName}}!</h1> element.
+    var greeting = element(by.binding('yourName'));
+
+    // Assert that the text element has the expected value.
+    // Protractor patches 'expect' to understand promises.
+
+    expect(greeting.getText()).toEqual('Hello Julie!');
+  });
+});
diff --git a/config/environments/ development.rb b/config/environments/ development.rb
new file mode 100644
index 0000000..794f8f8
--- /dev/null
+++ b/config/environments/ development.rb	
@@ -0,0 +1,41 @@
+Rails.application.configure do
+
+  # Settings specified here will take precedence over those in config/application.rb.
+  # In the development environment your application's code is reloaded on
+  # every request. This slows down response time but is perfect for development
+  # since you don't have to restart the web server when you make code changes.
+  config.cache_classes = false
+
+  # Do not eager load code on boot.
+  config.eager_load = false
+
+  # Show full error reports and disable caching.
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
+  # Don't care if the mailer can't send.
+  config.action_mailer.raise_delivery_errors = false
+
+  # Print deprecation notices to the Rails logger.
+  config.active_support.deprecation = :log
+
+  # Raise an error on page load if there are pending migrations.
+  config.active_record.migration_error = :page_load
+
+  # Debug mode disables concatenation and preprocessing of assets.
+  # This option may cause significant delays in view rendering with a large
+  # number of complex assets.
+  config.assets.debug = true
+
+  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
+  # yet still be able to expire them through the digest params.
+  config.assets.digest = true
+
+  # Adds additional error checking when serving assets at runtime.
+  # Checks for improperly declared sprockets dependencies.
+  # Raises helpful error messages.
+  config.assets.raise_runtime_errors = true
+
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
+end
diff --git a/initializers/ assets.rb b/initializers/ assets.rb
new file mode 100644
index 0000000..889a32e
--- /dev/null
+++ b/initializers/ assets.rb	
@@ -0,0 +1,12 @@
+# Be sure to restart your server when you modify this file.
+
+# Version of your assets, change this if you want to expire all your assets.
+Rails.application.config.assets.version = '1.0'
+
+# Add additional assets to the asset load path
+# Rails.application.config.assets.paths << Emoji.images_path
+
+# Precompile additional assets.
+
+# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
+# Rails.application.config.assets.precompile += %w( search.js )
diff --git a/rubocop.yml b/rubocop.yml
new file mode 100644
index 0000000..a9b5e2d
--- /dev/null
+++ b/rubocop.yml
@@ -0,0 +1,7 @@
+AllCops:
+Exclude:
+- 'bin/*'
+- 'config/*'
+- 'Rakefile'
+Lint/EndAlignment:
+Enabled: false