did stuff
Merge branch 'master' of github.com:Toukmond/broadcast

Conflicts:
	bcast.cpp