minor change
change2
Merge branch 'master' of https://github.com/hongnv55/ImagineCup_RecycleRobo

Conflicts:
	RecycleRobo/RecycleRoboContent/RecycleRoboContent.contentproj