First commit
Merge branch 'master' of github.com:plocan/siboy20

Conflicts:
	estoc_gmail