Integration branch requires commit prior to being able to merge 1_twospaces branch
Fixed Merge Conflicts caused when Merging from 1_twospaces Branch to Integration Branch

Merge branch 'feature/1_twospaces' into integration

Conflicts:
	app/assets/javascripts/application.js
	app/assets/stylesheets/_header.css.scss
	app/assets/stylesheets/deliveries.css.scss
	app/controllers/application_controller.rb
	app/controllers/deliveries_controller.rb
	app/controllers/static_pages_controller.rb
	app/controllers/users_controller.rb
	app/views/deliveries/edit.html.erb
	app/views/deliveries/index.html.erb
	app/views/deliveries/show.html.erb
	app/views/devise/sessions/new.html.erb
	app/views/devise/shared/_links.html.erb
	app/views/layouts/__application.html.erb
	app/views/static_pages/about_us.html.erb
	app/views/users/show.html.erb
	config/routes.rb
	spec/controllers/users_controller_spec.rb
Removed Unnecessary If Condition to Filter for Display of all Deliveries
Removed Unnecessary If Condition to Filter for Display of all Deliveries

Recreated the "feature/2_elsif" branch and added comments for the purpose of pushing to GitHub.
Previously the changes were made and "git flow feature finish 2_elsif" was entered to merge with
the "integration" branch, but this action also deleted the original "2_elsif" branch that is
required to be submitted to GitHub for evidence of closure of issue raised by Mikel.
Added Guard Gem to automatically run RSpec tests when test files change
Added Shoulda-Matchers Gem for Testing Associations
Added RSpec Tests for all Model Associations. Tests Pass
Added RSpect Tests for Static Pages Controller. Tests pass.
Attempted to add RSpec for Users Controller using FactoryGirl
Removed Unit Test files and folders to cleanup. Using RSpec instead.
Updated RSpec Test files to comply with Syntax on GitHub Gem Documentation. Added rspec-mocks gem.
Updated Gemfile with rspec-mocks gem
Fixed RSpec to pass all tests
Removed Disused RSpec Features folder
Removed Disused Helper Files
Replaced Application Layout with ERB. Removed HAML duplicate version
Removed Disused Javascript Files
Removed Disused Sass File
Indentation Fixed in Rosters/Index.html.erb
Merge branch 'feature/2_elsif' into integration