update ignore
clean after trouble
Merge branch 'master' of https://github.com/hiroMTB/3s1e

Conflicts:
	render/flow_4.1/src/ofApp.h
	study/flow_4/src/testApp.cpp