Init
Merge branch 'dev' of https://github.com/kinectNao/rednao

Conflicts:
	.gitignore