Merge branch 'master' of https://github.com/andr3a87/NG_Cafe

Conflicts:
	CLIPS/percept.clp