Add data matrix instade of qrcode
Merge branch 'master' of https://github.com/GiladShoham/RedRock

Conflicts:
	RedRock/RedRock.sln
Merge branch 'master' of https://github.com/GiladShoham/RedRock
Arrange all files and sln