Merge pull request #6 from garrettlord/master

Update
Merge pull request #16 from garrettlord/master

Matt
Merge pull request #30 from garrettlord/master

Updating masaaved
Made and edited test files
removed dummy files
Merge branch 'master' of https://github.com/garrettlord/TSP_Project

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/application.css.scss
	app/controllers/text_messages_controller.rb
	app/helpers/application_helper.rb
	app/models/group.rb
	app/models/group_user.rb
	app/models/user.rb
	app/views/group_users/show.html.erb
	app/views/groups/edit.html.erb
	app/views/groups/index.html.erb
	app/views/groups/new.html.erb
	app/views/groups/show.html.erb
	app/views/layouts/application.html.erb
	app/views/static_pages/home.html.erb
	app/views/users/edit.html.erb
	config/routes.rb
	db/schema.rb
	spec/models/group_spec.rb
	spec/models/group_user_spec.rb
	spec/models/user_spec.rb
	weather.rb
No changes
Merge branch 'master' of https://github.com/garrettlord/TSP_Project
scrambleGame without randomized words
Merge pull request #35 from garrettlord/master

Updating masaaved with what I think is the word stuff
Merge branch 'masaaved' of https://github.com/garrettlord/TSP_Project
Including imdb.rb test.rb and weather.rb
Merge branch 'master' of https://github.com/garrettlord/TSP_Project
Final logic for Scramble
Merge branch 'master' of https://github.com/garrettlord/TSP_Project
Merge pull request #40 from garrettlord/master

Updating masaaved with master
Merge branch 'masaaved' of https://github.com/garrettlord/TSP_Project