Solve the conflicts.

Conflicts:
	html/add.html
	js/script.js
	php/mySQL.php