first commit
mod. gitignore
Merge branch 'master' of git@github.com:vtomasr5/robotica

Conflicts:
	.gitignore