Added alert me function
Testing from home
Merge commit '3e2320546ee6e06b85f665160adbf1ebfc70e64f' into aramis

Conflicts:
	script.js
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
Merge branch 'aramis'

* aramis:
  Clear
  Testing from home
  Added alert me function

Conflicts:
	script.js