.
Merge branch 'master' of https://github.com/flaket/ostbar

Conflicts:
	nbproject/.DS_Store
	server/models/.DS_Store
	server/public/.DS_Store