afefe
Merge branch 'master' of https://github.com/daavdaav/Pacman.git

Conflicts:
	Pacman/src/NeuralNetwork/interfaces/NeuralLayerInterface.java