Update .gitignore
Merge branch 'master' of git@github.com:steveguoshao/rms.git

Conflicts:
	.gitignore