Updated Markdown
Merge branch 'master' of github.com:abraxas/barista

Conflicts:
	Readme.md