Ultimo commit
Merge branch 'master' of https://github.com/Ifrago/Beeter

Conflicts:
	README.md