Add files
Merge branch 'master' of https://github.com/shi-314/nn

Conflicts:
	.gitignore
	README.md
Fix gitignore merge conflict