now it changes css infinitely.
Merge remote-tracking branch 'origin/master' into sergio3

Conflicts:
	index.html
	res/project1.js