test
Merge branch 'master' of https://github.com/Tuxii/2042

Conflicts:
	wp-content/themes/twenty-forty-two/style.css