Merge
Merge branch 'master' of https://github.com/oozliuoo/courseInfo

Conflicts:
back/php/api/userLogin.php
back/php/include/signin_api.php
index.php
login.php
mERGE
Merge branch 'master' of https://github.com/oozliuoo/courseInfo

Conflicts:
	back/php/api/userLogin.php
	back/php/include/signin_api.php
	index.php
	login.php