terms and conditions text
Merge branch 'master' of https://github.com/ClaudioMeinberg/catarse

Conflicts:
	app/assets/stylesheets/new/tmpClaudio.css
terms-and-conditions css