init
Merge branch 'master' of github.com:blacksnow666/ottocount

Conflicts:
	.gitignore