commit
Merge branch 'master' of https://github.com/chupa2042/twenty-forty-two

Conflicts:
	license.txt
	readme.html
	wp-config.php
	wp-content/plugins/akismet/admin.php
	wp-content/plugins/akismet/akismet.css
	wp-content/plugins/akismet/akismet.js
	wp-content/plugins/akismet/akismet.php
	wp-content/plugins/akismet/readme.txt
	wp-content/themes/twentyfortytwo/archive.php
	wp-content/themes/twentyfortytwo/css/bootstrap.min.css
	wp-content/themes/twentyfortytwo/fonts/glyphicons-halflings-regular.eot
	wp-content/themes/twentyfortytwo/fonts/glyphicons-halflings-regular.svg
	wp-content/themes/twentyfortytwo/fonts/glyphicons-halflings-regular.ttf
	wp-content/themes/twentyfortytwo/fonts/glyphicons-halflings-regular.woff
	wp-content/themes/twentyfortytwo/footer.php
	wp-content/themes/twentyfortytwo/functions.php
	wp-content/themes/twentyfortytwo/header.php
	wp-content/themes/twentyfortytwo/index.php
	wp-content/themes/twentyfortytwo/js/bootstrap.min.js
	wp-content/themes/twentyfortytwo/loop.php
	wp-content/themes/twentyfortytwo/page.php
	wp-content/themes/twentyfortytwo/screenshot.png
	wp-content/themes/twentyfortytwo/searchform.php
	wp-content/themes/twentyfortytwo/sidebar.php
	wp-content/themes/twentyfortytwo/single.php
	wp-content/themes/twentyfortytwo/style.css
	wp-content/themes/twentyfourteen/images/pattern-dark.svg
	wp-content/themes/twentyfourteen/images/pattern-light.svg
	wp-content/themes/twentyfourteen/languages/twentyfourteen.pot
	wp-content/themes/twentythirteen/languages/twentythirteen.pot
	wp-content/themes/twentytwelve/header.php
	wp-content/themes/twentytwelve/languages/twentytwelve.pot
	wp-includes/images/crystal/license.txt
	wp-includes/js/jquery/jquery-migrate.js
	wp-includes/js/jquery/jquery-migrate.min.js
	wp-includes/version.php