third commit
Newer Commit
Merge branch 'master' of https://github.com/jruizgit/cloud

Conflicts:
	test.js