changed ignore files
Merge branch 'master' of https://github.com/lyifan/atmsi

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/lyifan/atmsi
Merge branch 'master' of https://github.com/lyifan/atmsi