Merge branch 'master' of
https://github.com/taojintianxia/DailySisyphus.git

Conflicts:
	pom.xml
change the pom file