grouping
Merge branch 'master' of https://github.com/grzegorzhauska/expedia-projekt

Conflicts:
	.gitignore
grouping 2