init
Merge branch 'master' of https://github.com/stelee/webmonitor

Conflicts:
	.gitignore