add my
Merge branch 'master' of github.com:freddie218/bbs_team_b

Conflicts:
	prepare_database.sh~
	src/main/java/com/thoughtworks/bbs/service/impl/UserServiceImpl.java
	src/test/java/com/thoughtworks/bbs/service/impl/UserServiceImplTest.java