base changes changes

Conflicts:
	src/content/templates/content.mustache
did all my changes yo

Conflicts:
	src/content/views/content-view.js