it works bitchezzzzzz
Merge branch 'master' of https://github.com/tediris/BrickBeater

Conflicts:
	BrickBeater.ino