initial commit
test commit
Merge branch 'master' of ssh://internetolympiad.org:57348/var/www/karl

Conflicts:
	index.php
SQLBuddy.