random stuff
Merge branch 'master' of https://github.com/MattDekinder/391-Radiology-Information-System

Conflicts:
	database.php