delete .settings
delete some files
delete some files
push?
Merge branch 'master' of https://github.com/RyoichiNishio/mahjong

Conflicts:
	.DS_Store