hg
dsafadsfMerge branch 'master' of
https://github.com/ratkaisutiimi/kurnu.git

Conflicts:
	wp-content/themes/bones/library/css/style.css