.gitignore
Merge branch 'master' of https://github.com/cloverlab/cl_echo1

Conflicts:
	.gitignore