coments +articles
fix
Merge remote-tracking branch 'origin/carla2' into aida

Conflicts:
	about.html
	res/project1.css