program
Merge branch 'master' of https://github.com/Shyon/Gazdinfo

Conflicts:
	LEVI'SZ/views/sidebar_member.php