team2
Merge remote-tracking branch 'origin'

Conflicts:
	app/views/staticpage/index.html.haml
team3
Merge remote-tracking branch 'origin'

Conflicts:
	app/assets/stylesheets/staticpage.css.scss
	app/views/staticpage/index.html.haml
correcciones al Meet the team