Merge pull request #1 from johnnymo87/master

article background added to feature file
Minor features changes
Merge branch 'master' of https://github.com/AbbyJonesDev/may

Conflicts:
	features/article_visitors.feature
	features/step_definitions/article_steps.rb
Added MIT license and 'bootstrap-sass' gem.  Modified application.js and application.css.scss to get Bootstrap styles hooked up.
Bootstrap setup in Views:  Modified application.html.erb to fit Bootstrap and added/set up partials for navigation and messages.
Simple Form:  Added gem and installed with Bootstrap option.  Set up dummy form in Article#new to verify that it was working.
Passing Cucumber scenario for viewing index page (including photo attached to articles).  Did some refactoring of Cucumber steps.  Installed FactoryGirl.  Wrote and passed one Rspec test for Article model (creating preview of article).
In article_visitors feature - added scenario for viewing individual article
Began writing create_article feature

Changed Cucumber and Rspec tests to avoid uploading images each time the index and show tests are run.  (Articles should use default image url instead.)  Tests fails to show the image.  On LocalHost, throws error that no route matches GET "path to image"  (Though path to image seems to be correct.)

Attempted to resolve by adding "photo" as a member of "articles" in routes.rb but commented out when it failed.

Made multiple adjustments to ensure that database is cleaned before and after tests, duplicate files are not created, and running parallel tests doesn't cause errors with Paperclip.
Created and applied migration to add "admin" as a boolean field in User model.  Updated seeds.rb to reflect change.
Copied the Devise registration forms (new and edit) and changed them to add a User Name.
Working on Create_Article feature using BDD with Cucumber.

Next 2 problems to solve:
  1.  How to write step for selecting a photo file to upload
  2.  How to resolve ActiveModel::ForbiddenAttributesError when saving article
save before merge
merge complete