upd
Merge branch 'master' of https://github.com/Splintex/CinemaGuru

Conflicts:
	css/screen.css