With saluation at the top
Merge branch 'master' of https://github.com/junzhiseah/is306

Conflicts:
	accountinfo.php