哈哈
Merge branch 'master' of https://github.com/bobmeek/MyBlog_2014-12-04

Conflicts:
	src/org/myblog/controller/LoginControllerr.java