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

Conflicts:
	scripts/views/valuetable.js