Creating template
start up tecno3
update project
Se define las secciones y navegacion
Merge remote-tracking branch 'openshift/master'

Conflicts:
	README.md
	app/app.js
	app/index.html
	bower.json