Merge 1
Merge branch 'master' of https://github.com/zeroexu/tercosystem

Conflicts:
	.DS_Store
	greenDog/.DS_Store
	greenDog/greenDog/HelloWorldLayer.m