Initial Commit
Merge branch 'master' of https://github.com/lendon1/Heather_Gates

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.css
	app/models/unit.rb
	app/views/layouts/application.html.erb
	app/views/units/_form.html.erb
	app/views/units/index.html.erb
	app/views/units/show.html.erb
	config/application.rb
	config/database.yml
	config/environments/production.rb
	config/initializers/secret_token.rb
	config/routes.rb
	script/rails
	test/fixtures/units.yml
	test/functional/units_controller_test.rb
Merge branch 'master' of https://github.com/lendon1/Heather_Gates

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.css
	app/models/unit.rb
	app/views/layouts/application.html.erb
	app/views/units/_form.html.erb
	app/views/units/index.html.erb
	app/views/units/show.html.erb
	config/application.rb
	config/database.yml
	config/environments/production.rb
	config/initializers/secret_token.rb
	config/routes.rb
	script/rails
	test/fixtures/units.yml
	test/functional/units_controller_test.rb
Merge branch 'master' of https://github.com/lendon1/Heather_Gates

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.css
	app/models/unit.rb
	app/views/layouts/application.html.erb
	app/views/units/_form.html.erb
	app/views/units/index.html.erb
	app/views/units/show.html.erb
	config/application.rb
	config/database.yml
	config/environments/production.rb
	config/initializers/secret_token.rb
	config/routes.rb
	script/rails
	test/fixtures/units.yml
	test/functional/units_controller_test.rb
Cleanup and initial functional test
Initial Setup

Signed-off-by: root <root@lenny-laptop.lennyblumberg.com>
Merge branch 'master' of https://github.com/lendon1/Heather_Gates

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.css
	app/models/unit.rb
	app/views/layouts/application.html.erb
	app/views/units/_form.html.erb
	app/views/units/index.html.erb
	app/views/units/show.html.erb
	config/application.rb
	config/database.yml
	config/environments/production.rb
	config/initializers/secret_token.rb
	config/routes.rb
	script/rails
	test/fixtures/units.yml
	test/functional/units_controller_test.rb
Cleanup and initial functional test