initial commit_2
add cum3
cum_base
not base but b
not base but c
Merge branch 'base'

Conflicts:
	app/views/layouts/application.html.erb
tag