no message
Merge branch 'master' of https://github.com/anogowski/PRO160_Team7_Project

# By SuperAwesomeMane (11) and others
# Via wozhendeaa (3) and Nathan Morley (1)
* 'master' of https://github.com/anogowski/PRO160_Team7_Project: (24 commits)
  model classes
  database sql file
  Added Disorders.cs, updated Prescription and Diseases
  fixed an error
  changed a variable name
  took of static from Diseases
  Moved Patient outside of users
  did some error checking when logging in
  created some new code to determine whether it's an administrator or doctor logging ine
  Added base classes
  created login windows
  Initial commit for Medical System
  Nice, new, clean mutha f**kin project
  changed a class name and (still) working on the drawshapemanager class
  added static shapes to screen
  created lists for the shapes for them to be added to for when they are called to be drawn
  Revert "no message"
  trying adding SandBox.csproj that rafik deleted
  no message
  Moved some files around so that everything works
  ...

Conflicts:
	SandBox/SandBox.v11.suo
	SandBox/SandBox/SandBox/Game1.cs
	SandBox/SandBox/SandBox/Physics/Collision.cs
	SandBox/SandBox/SandBox/Shapes/Rectangle.cs
	SandBox/SandBox/SandBox/bin/x86/Debug/Content/circle.xnb
	SandBox/SandBox/SandBox/bin/x86/Debug/Content/rectangle.xnb
	SandBox/SandBox/SandBox/bin/x86/Debug/Content/triangle.xnb
	SandBox/SandBox/SandBox/bin/x86/Debug/SandBox.exe
	SandBox/SandBox/SandBox/bin/x86/Debug/SandBox.pdb
	SandBox/SandBox/SandBox/obj/x86/Debug/SandBox.exe
	SandBox/SandBox/SandBoxContent/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Merge branch 'master' of https://github.com/anogowski/PRO160_Team7_Project
Merge branch 'master' of https://github.com/anogowski/PRO160_Team7_Project

# By SuperAwesomeMane (1) and wozhendeaa (1)
# Via SuperAwesomeMane
* 'master' of https://github.com/anogowski/PRO160_Team7_Project:
  login screen now remembers previous doctors AND admins, but separately
  updated sql file