orororo
beta1.0
aa
aaaa
aaa
Merge branch 'master' of https://github.com/handsomeTom/mblog

Conflicts:
	.project
	.settings/org.eclipse.core.resources.prefs
remove seting