refactoring

Conflicts:
	CLIPS/batch.bat
	CLIPS/strategy1.clp
Merge branch 'master' of https://github.com/andr3a87/NG_Cafe

This reverts commit c49151be5de3c93e9a7902d961f11a7c6881a6a8.