Merge branch 'master' into paul-encapsulating-main-and-curses

docs/plan.md

@@ -0,0 +1,31 @@
+# Project Plan - cc3k
+
+## Plan of Attack
+
+**Question 1:**
+
+How could your design your system so that each race could be easily generated? Additionally, how difficult does such a solution make adding additional races?
+
+**Question 2:**
+
+How does your system handle generating different enemies? Is it different from how you generate the player character? Why or why not?
+
+**Question 3:**
+
+How could you implement the various abilities for the enemy characters? Do you use the same techniques as for the player character races? Explain.
+
+**Question 4:**
+
+What design pattern could you use to model the effects of temporary potions (Wound/Boost Atk/Def) so that you do not need to explicitly track which potions the player character has consumed on any particular floor?
+
+**Question 5:**
+
+How could you generate items so that the generation of Treasure and Potions reuses as much code as possible? That is, how would you structure your system so that the generation of a potion and then generation of treasure does not duplicate code?
+
+## Estimated Completion Dates
+
+## Task Ownership
+
+- Paul:
+- Derek:
+- Angelina:

docs/uml.md

@@ -0,0 +1,22 @@
+# UML Model
+
+## Class Diagram
+
+```plantuml
+@startuml
+class User {
+    - id: int
+    - name: string
+    - email: string
+    - password: string
+    + getId(): int
+    + getName(): string
+    + getEmail(): string
+    + getPassword(): string
+    + setId(id: int): void
+    + setName(name: string): void
+    + setEmail(email: string): void
+    + setPassword(password: string): void
+}
+@enduml
+```