ignore log, not logs
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
Merge remote-tracking branch 'jeko/master'

Conflicts:
	lib/social.rb
remove fifo
ignore media folder
rename Server#end_match to #close_match
Add media to gitignore