changes
Merge branch 'master' of https://github.com/UndergraduateStudy/CSC210FinalProject

Conflicts:
	php/addbook.php
yeah

ha