.gitignore created by brackets-git extension
Merge remote-tracking branch 'origin/master'
Añadí un IF
Añadi alert
Merge remote-tracking branch 'origin/master'

Conflicts:
	script.js
Cleaned
añadí {}
Merge remote-tracking branch 'origin/master'Conflicts:	script.js
Merge remote-tracking branch 'origin/master'
treytr
Merge branch 'master' of https://github.com/alfonsomr/javascript

Conflicts:
	script.js
trtrtrrtrt
Lo puse en la funcion
another alert
Testing from home
Merge commit '3e2320546ee6e06b85f665160adbf1ebfc70e64f' into aramis

Conflicts:
	script.js