base version
Merge github.com:triplekill/homework

Conflicts:
	.gitignore

/node_models