type error fixed
Merge branch 'master' of https://github.com/kelidas/scratch.git

Conflicts:
	scratch/ffnet_test/ffnet_view.py