Merge branch 'master' of github.com:Towels/Assignment-4

* 'master' of github.com:Towels/Assignment-4:
  Other 0,0-Bug fixed

Conflicts:
	db.php
Merge branch 'master' of github.com:Towels/Assignment-4

* 'master' of github.com:Towels/Assignment-4: