DO IT
hoi
Merge branch 'master' of https://github.com/Stefferp/team2

Conflicts:
	Business Rule Generator/src/rules/RulesFacade.java