crud base

Conflicts:

	app/views/layouts/application.html.erb