Merge pull request #3390 from edx/ahodges/documentation/LMS2476

Ahodges/documentation/lms2476

docs/en_us/course_authors/source/change_log.rst

@@ -11,11 +11,14 @@ April, 2014
    :header-rows: 1
 
    * - Date
+<<<<<<< HEAD
      - Change  
    * - 04/24/14
      - Expanded the :ref:`Grades` chapter to include topics on interpreting the grade reports and student progress page.
+   * -    
+     - Updated the :ref:`Beta_Testing` section to reflect feature changes.
    * - 04/23/14
-     - Reorganized info about problems into :ref:`Exercises and Tools Index` section  
+     - Reorganized information about problems into :ref:`Exercises and Tools Index` section.
    * - 04/23/14
      - Added more information about collecting language and location data from students to :ref:`Student Data`.  
    * - 04/22/14
@@ -74,8 +77,7 @@ March, 2014
      - Updated the :ref:`Adding Pages to a Course` section to reflect feature
        changes.
    * - 03/27/14
-     - Updated the section on :ref:`Beta_Testing` to include the new "batch add"
-       feature.
+     - Updated the section on :ref:`Beta_Testing` to include the new "batch add" feature.
    * - 03/19/14
      - Updated the sections on :ref:`Beta_Testing`, :ref:`Discussions`,
        :ref:`Grades`, and :ref:`Student Data` with changes to the new Instructor Dashboard.