renovacion web verano 2014
Merge remote-tracking branch 'origin/master'

Conflicts:
	img/header2.jpg