First commit
Merge branch 'master' of https://github.com/kdelemme/angularjs-nodejs-sysinfo

Conflicts:
	.gitignore
	README.md