gitignore angepasst
Merge remote-tracking branch 'origin/master'

Conflicts:
	Server_final/db/user.nedb