Merge pull request #13 from rw1993/master

suojing
缩进啊缩进啊！！！！
suojinasuojina
Merge pull request #14 from Narcssus/master

	缩进啊缩进啊！！！！
redesign_controller and url