index
index

Conflicts:
	.DS_Store
	app/.DS_Store
	app/views/.DS_Store