Finished merging user stories in Sprint 3. Minor typo fixes in Retro.

2 files changed, 18 insertions, 25 deletions

diff --git a/doc/Sprint2-Retrospective.md b/doc/Sprint2-Retrospective.md
index a7912b6..3a67d9f 100644
--- a/doc/Sprint2-Retrospective.md
+++ b/doc/Sprint2-Retrospective.md
@@ -101,7 +101,7 @@ A single-elimination pairing algorithm was chosen for similar reasons (as well
 as for simplicity in SVG generation).
 
 ## Implement game-type specific and tournament specific settings and preferences
-   {(#setting-and-pref)}
+   {#setting-and-pref}
 
 The input for settings and preferences for creating tournaments are displayed 
 dynamically in both the substance of the content and form in which it is displayed.
@@ -172,7 +172,7 @@ also possible to utilize a number of other image options, such as sizing.
 
 # Implemented but not working well
 
-## Not Applicable (#all-or-nothing)
+## Not Applicable {#all-or-nothing}
 
 Everything we implemented was implemented well, or else we didn't implement it.
 
@@ -180,7 +180,7 @@ Everything we implemented was implemented well, or else we didn't implement it.
 
 # Not implemented
 
-## Email Verification Option (#email-verify)
+## Email Verification Option {#email-verify}
 
 This was not implemented for lack of time. Luke probably would have been able to
 implement it with his time constraints if he wasn't busy frequently assisting
diff --git a/doc/sprint3.md b/doc/sprint3.md
index a29e625..d4e0abb 100644
--- a/doc/sprint3.md
+++ b/doc/sprint3.md
@@ -10,39 +10,32 @@ author: [ Nathaniel Foy, Guntas Grewal, Tomer Kimia, Andrew Murrell, Luke Shumak
 2) As an admin, I would like to have an email verification system for a more secure
   and spam free enviroment.
 
-3) As an admin, I would like to send alerts to users.
+3) As a user, I would like intelligent error handling (e.g. 404 and 403 redirection).
 
-4) As a user, I would like to be able to send private messages.
+4) As an admin, I would like to send alerts to users.
 
-5) As a user, I would like a working search utility
+5) As a user, I would like to be able to send private messages.
 
-6) As a host or player, I would like a larger set of peer evaluation settings.
+6) As a user, I would like a working search utility.
 
-7) As a host, I would like to have multiple tournament structures and types for 
+7) As a host or player, I would like customizable settings for peer evaluation and 
+  scoring.
+
+8) As a host, I would like to have multiple tournament structures and types for 
   pairing and running tournaments. (e.g. Round Robin team pairings).
 
-8) As a user, I would like to view and create brackets.
+9) As a host, I would like to have an interface for adding tournament-specific 
+  preferences (e.g. Capture the Teemo).
+
+10) As a user, I would like to view and create brackets.
 
-9) As a user, I would like the Riot API to be asynchronously polled in the 
+11) As a user, I would like the Riot API to be asynchronously polled in the 
   background so League of Legends tournaments proceed automatically.
 
-10) As a player, I would like a way to enter my usernames for several different
+12) As a player, I would like a way to enter my usernames for several different
   remote games.
 
 
-
-
-# User Stories  -- Andrew's remaining ones.
-
-1) As a user, I would like intelligent error handling and 404 redirection.  -- goes with #1
-
-5) As a host, I would like to have multiple options for scoring.  -- goes with #7 ?
-
-7) As a host, I would like to have an interface for adding tournament-specific preferences.  --?
-
-8) As a host, I would like to allow a wider variety of kinds of settings to be set.  -?
-
-
 #Tasks
 
 The "size" is using the modified Fibonacci scale.  A '1' is expected
@@ -53,7 +46,7 @@ several days.
 +---------------------------------------------------------+------+------------+----+
 | Task Description                                        | Size | Person     | US |
 +=========================================================+======+============+====+
-| Intelligent Error Handling (404 redirection)            |   3  | Andrew     | 2  |
+| Intelligent Error Handling (404 redirection)            |   3  | Andrew     | 1  |
 +---------------------------------------------------------+------+------------+----+
 | Search                                                  |      |            |    |
 +---------------------------------------------------------+------+------------+----+