edit text
Merge branch 'master' of https://github.com/nung1com/estudent.git

Conflicts:
	public/index.php
Merge branch 'master' of https://github.com/nung1com/estudent.git

Conflicts:
	public/index.php
Merge branch 'master' of https://github.com/nung1com/estudent.git
edit index
Merge branch 'master' of https://github.com/nung1com/estudent.git
addtonanasara