treytr
Merge branch 'master' of https://github.com/alfonsomr/javascript

Conflicts:
	script.js
trtrtrrtrt