update 1.1.4
add .gitignore .ds_store
Revert "add .gitignore .ds_store"

This reverts commit 55c408b2a02c9b73628b96f25ec83137296e3bff.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore