merge
Merge branch 'master' of github.com:bobbykrk/neural-net

Conflicts:
	.idea/workspace.xml
dodanie gitignore