properties something
Merge branch 'master' of http://github.com/fischers23/Robot.git

Conflicts:
	Robot/project.properties

+gitignore properties