Merge branch 'master' of github.com:home-work/logikan

Conflicts:
	logikan.sql