update ignore file to ignore config/database.yml
Merge branch 'master' of https://github.com/zhouhang/pingtai

Conflicts:
	.gitignore
	config/database.yml