added punc count, changed net param.
Merge branch 'bOne'

Conflicts:
	authid.m
	count.py