fix
Neural network
Merge branch 'master' of https://github.com/josago/ATAA2014

Conflicts:
	src/ataa2014/NeuralNet.java
	src/com/mojang/mario/LevelScene.java
	src/com/mojang/mario/MarioComponent.java