add table report A2 A4
add talbe report C6
change admin model
Merge branch 'master' of github.com:ludwiksh/Marksimos

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge branch 'master' of github.com:ludwiksh/Marksimos

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
add
add css for table
add table B2
Merge branch '2014-11-19-5'
change style
add create student  type
Merge branch 'master' of github.com:ludwiksh/Marksimos
Merge branch 'haosun'
add table report C5
Merge branch '2014-11-20'
fixed
add
fix table report A4
Merge branch 'master' of github.com:ludwiksh/Marksimos
add table report C5