change gitignore
test
Merge branch 'develop' of https://frankgu@github.com/frankgu/myblog.git
into develop

Conflicts:
	.gitignore
	.project