+ change setup
Merge branch 'master' of https://github.com/jeonghopark/butterFlyCurve

Conflicts:
	butterFly_Linegenerator/src/ofApp.cpp
	butterFly_Linegenerator/src/ofApp.h