Primer commit
Merge branch 'master' of http://github.com/fabsalito/sf22test

Conflicts:
	.gitignore
	README.md