stef
Merge branch 'master' of https://github.com/stefthedrummer/Workspace.git

Conflicts:
	de.stef.perceptron/src/de/stef/perceptron/Main.java