sync gitignore, dsstore
Merge branch 'master' of https://github.com/flaket/ostbar

Conflicts:
	.DS_Store
	server/models/.DS_Store