哈哈

呵呵
哈哈

呵呵
哈哈

呵呵
哈哈

呵呵
Merge branch 'master' into JBLong

Conflicts:
	WishWall/application/classes/Wish.php
	WishWall/application/controllers/welcome.php
	WishWall/application/models/WishManager.php
merge

hahaa
没啥可说的

都在这儿了
Merge branch 'JBLong'
Merge branch 'master' of https://github.com/jxWho/WishWall