first commit to nice branch
Update connect.inc.php

changed connect info from local host to live db
Update connect.inc.php
First round of merge
Merge branch 'nice' of github.com:sutt0n/spe into nice
Merge branch 'nice' of https://github.com/sutt0n/spe

Conflicts:
	Scheduling/Scheduling Code/code/connect.inc.php
	admin/connect.inc.php
deleted repeated files and files~