base
app/view
Merge branch 'static-pages'

Conflicts:
	app/views/.DS_Store