ff
ff
aa
aaa
Merge branch 'master' of https://github.com/bapjg/Eclipse.git

Conflicts:
	eRegulation/eRegulation/CircuitBoiler.class
	eRegulation/eRegulation/Thread_UserInterface.java