new art
a bad thing happened I think I fixed it?

Conflicts:
	includes/functions.php