1.2
Merge branch 'master' of https://github.com/viniciusmagalhaes/JavaScript

Conflicts:
	loop.html