Merge branch 'database'

Conflicts:
	todo.txt

Merging todo.txt into the master branch, despite trying to keep it
separate.

README.md

@@ -6,7 +6,7 @@ This game is inspired by classic 2D RPGs, as well as more modern sandbox MMOs. T
 
 ## External Dependencies
 
-* [SDL 1.6](http://www.libsdl.org/) - Simple DirectMedia Layer API
+* [SDL 1.2](http://www.libsdl.org/) - Simple DirectMedia Layer API
 * [SDL_net 1.2](http://www.libsdl.org/projects/SDL_net/) - SDL's networking extension
 * [lua 5.2](http://www.lua.org/) - The lua programming language
 * [SQLite3](http://www.sqlite.org/) - A lightweight SQL database engine

todo.txt

@@ -0,0 +1,37 @@
+I need to keep the documentation up to date. Namely, the GDD is getting out of date.
+
+--Naming conventions--
+
+I need to define the differences between several different terms i.e. naming conventions.
+I may also need to rewrite some variable names.
+
+* User: This is the individual who is playing the game
+* Player: A synonym for a user
+* Character: This is the actual player character in the game
+* Username: This is the name of the player; ususally kept private
+* Handle: This is the name of a character
+* Avatar: This is the name of the sprite used by a character
+
+--ServerApplication's methods--
+
+These interact with the database file, making the server a persistent system.
+
+* CreateUserAccount
+* LoadUserAccount
+* SaveUserAccount
+* UnloadUserAccount
+* DeleteUserAccount
+
+* CreateCharacter
+* LoadCharacter
+* SaveCharacter
+* UnloadCharacter
+* DeleteCharacter
+
+--Battle System--
+
+CombatPortal:
+	x, y
+	list<Character>
+	list<Monster>
+	//...