DB returns instances of their respective classes, File upload, error page for routes
Merge branch 'master' of https://github.com/elliotanderson13/PHPFramework

Conflicts:
	cache/tmp/temp.php