beep
Merge branch 'master' of github.com:pidgeonproject/pidgeon

Conflicts:
	Services/Buffer.cs