fff
Merge branch 'master' of https://github.com/Zhukovo/RoR-Egzamin

Conflicts:
	.travis.yml