szukajka zbugowana zapewne
Merge branch 'master' of https://github.com/Killavus/BD2013-Projekt

Conflicts:
	pages/play.php
	pages/play_index.php

Merge