join stuff
Merge branch 'master' of github.com:StevenGerdes/ECE421-project-5

Conflicts:
	game_main.rb
	games_host.rb