Merge branch 'IE-Testing'

404.php

@@ -21,7 +21,7 @@
 								</header><!-- .page-header -->
 
 								<div class="page-content">
-									<p><?php _e( 'It looks like nothing was found at this location. Maybe try one of the links below or a search?', 'cs' ); ?></p>
+									<p><?php _e( 'It looks like nothing was found at this location. Maybe try one of the links above or a search?', 'cs' ); ?></p>
 									<?php get_search_form(); ?>
 								</div><!-- .page-content -->
 							</div>

_notes/dwsync.xml

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="utf-8" ?><dwsync><file name=".DS_Store" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3487060276" remote="-4611742485168929597" Dst="-1" /><file name="404.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611742485168929583" Dst="-1" /><file name="archive.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611742485168929583" Dst="-1" /><file name="comments.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611742485168929582" Dst="-1" /><file name="content-none.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3484303703" remote="-4611742485168929582" Dst="-1" /><file name="content-page.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611742485168929582" Dst="-1" /><file name="content-single.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3484303652" remote="-4611742485168929582" Dst="-1" /><file name="content.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611742485168929582" Dst="-1" /><file name="footer.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611742485168929582" Dst="-1" /><file name="functions.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488537822" remote="997424038209838302" Dst="-1" /><file name="header.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488538264" remote="7783505565" Dst="-1" /><file name="index.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611742485168929582" Dst="-1" /><file name="mega-footer.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611742485168929581" Dst="-1" /><file name="page-home.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611742485168929581" Dst="-1" /><file name="page.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="997424038209766611" Dst="-1" /><file name="README.html" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3484302198" remote="-4611742485168929581" Dst="-1" /><file name="README.md" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3484302198" remote="-4611742485168929581" Dst="-1" /><file name="screenshot.png" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611742485168929581" Dst="-1" /><file name="search.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611742485168929581" Dst="-1" /><file name="searchform.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611742485168929581" Dst="-1" /><file name="sidebar.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611742485168929581" Dst="-1" /><file name="single.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611742485168929581" Dst="-1" /><file name="style.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488538867" remote="602446763926675704" Dst="-1" /><file name="style.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488530616" remote="997424038209831096" Dst="-1" /><file name="search.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488466131" remote="997500248109466835" Dst="-1" /><file name="searchform.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488553209" remote="7783520508" Dst="-1" /><file name="style.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488555116" remote="7783522413" Dst="-1" /><file name="page-home.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488555015" remote="7783522312" Dst="-1" /><file name="functions.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488800337" remote="7783767634" Dst="-1" /><file name="style.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488798909" remote="602446763926935760" Dst="-1" /><file name="header.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488798549" remote="7783765845" Dst="-1" /><file name="404.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488801785" remote="7783769086" Dst="-1" /></dwsync>