Creating template
Merge branch 'master' of ssh://yoboard-pyosbarbos.rhcloud.com/~/git/yoboard

Conflicts:
	README.md
Fix the `style` cookie.
Specify the socket family in the config.