Initial commit
Commit before pushing to github
Merge branch 'master' of github.com:nrocco/smeterd

Conflicts:
	.gitignore