Merge remote-tracking branch 'origin/master'

Conflicts:
	404.php

404.php

@@ -14,7 +14,11 @@ get_header(); ?>
 
 			<section class="error-404 not-found">
 				<header class="page-header">
+<<<<<<< HEAD
 					<h1 class="page-title"><?php _e( 'Sorry! That page can&rsquo;t be found.', 'twentyfifteen' ); ?></h1>
+=======
+					<h1 class="page-title"><?php _e( 'Oops! That page can&rsquo;t be found..', 'twentyfifteen' ); ?></h1>
+>>>>>>> origin/master
 				</header><!-- .page-header -->
 
 				<div class="page-content">