First
Merge branch 'master' of github.com:thiagooak/buffer-share

Conflicts:
	.gitignore