Trying to make gitignore work
Trying more
Merge branch 'master' into ShooterBranch

Conflicts:
	MasterRobot/nbproject/project.bak.xml
	MasterRobot/nbproject/project.xml
Nothing