.gitignore
Merge branch 'master' of github.com:aidanguan/MyBlog

Conflicts:
	db/development.sqlite3
	log/development.log
Merge branch 'master' of github.com:aidanguan/MyBlog

Conflicts:
	log/development.log
Merge branch 'master' of github.com:aidanguan/MyBlog

Conflicts:
	db/development.sqlite3
	log/development.log