a
Merge branch 'master' of https://github.com/Pata94/boolean-functions

Conflicts:
	scripts/models/kv-table.js
	scripts/views/page.js