2014/3/18
2014/3/18AA
Merge branch 'master' of https://github.com/linym/DBhw2

Conflicts:
	connect.php
	signup.php