I hate git
test
test
Merge remote-tracking branch 'origin/Elia-branch' into Elia-branch

Conflicts:
	src/api/Pair.java
	src/api/ann/ArtificialNeuronNetwork.java
	src/api/classifiers/IClassifier.java
	src/controller/Controller.java
	src/controller/Main.java
	src/view/MyFrame.form
	src/view/MyFrame.java
Part 1 config complete. Progress bar isn't attached.
Part 1 config complete. Progress bar isn't attached.
before merging with omer
Merge pull request #3 from eliagrady/Elia-branch

Elia branch