CSS Meniny & Pripomienkovač
Merge branch 'master' of https://github.com/Befinger/TINA-project

Conflicts:
	pages/scripts/meniny/meniny.js