删除行末空白
Merge branch 'master' of github.com:AirCoding/AirCoding
fix bug
Merge branch 'master' of github.com:AirCoding/AirCoding

Conflicts:
	app/controllers/AccountController.php
add user
Merge branch 'master' of github.com:AirCoding/AirCoding

Conflicts:
	app/controllers/AccountController.php
Merge branch 'master' of github.com:AirCoding/AirCoding
done
Merge branch 'master' of github.com:AirCoding/AirCoding

Conflicts:
	app/controllers/AccountController.php