fanva 1332
Merge branch 'master' of github.com:durka/alexburka.com

Conflicts:
	lojban/index.php