Second commit, resolves #2
Merge branch 'master' of https://github.com/tiagokos/beerver

Conflicts:
	README.md