add server module
add empty media folder
Merge remote-tracking branch 'jeko/master'

Conflicts:
	.gitignore
	.rspec
	Gemfile
	Gemfile.lock
	lib/player.rb
	lib/sound.rb
	lib/team.rb
	main.rb
	spec/lib/player_spec.rb
ignore config.yml
fix config require file path