console.log
Merge branch 'master' of github.com:rtoal/hello

Conflicts:
	fancy.js