serwer: Naprawa plikow
Merge branch 'master' of https://github.com/nsn-wroclaw/innovativeproject-meetinghelper

Conflicts:
	.gitignore