deleted unnecessary files and updated gitignore
new files
made changes
push
Merge branch 'master' of https://github.com/holtc/nets

Conflicts:
	.DS_Store
	data/.DS_Store
	src/.DS_Store