k
Merge branch 'master' of https://github.com/ratkaisutiimi/kurnu.git

Conflicts:
	wp-content/themes/bones/comments.php