new function
Merge branch 'master' of https://github.com/alfonsomr/javascript into aramis

# By Jose Marquez
# Via Jose Marquez
* 'master' of https://github.com/alfonsomr/javascript:
  new function

Conflicts:
	script.js
Clear