:3
Merge branch 'master' of https://github.com/abresee/hello

Conflicts:
	server/gstreamer/Makefile.bak