first clab commit
Merge branch 'master' of https://github.com/montoyaedu/clab

Conflicts:
	.gitignore
	README.md