yy
yy
Merge branch 'master' of https://github.com/whyvine/xuetang

Conflicts:
	public/assets/application-171bcf43fb57001a3f053ff603532cd7.js.gz
	public/assets/bootstrap/js/application-4aae8c9b94c78a97fc419a57bcb7f8d7.js.gz
	public/assets/js/application-51891da1b3c88a89e1e7bac430a7602f.js.gz
Merge branch 'master' of https://github.com/whyvine/xuetang