Merge pull request #9 from gmy/master

Sprint 2 demo
test push
new skeleton
test Macair
authorization finishied,begin admin function
mm
Merge remote-tracking branch 'tracyyjy/master'

new merge from master
show.html