node
Merge branch 'master' of github.com:radustoenescu/household

Conflicts:
	.bashrc
	.gitignore