alt
fix conficts

Conflicts:
	views/index.jade