synching number 1
commit agin
Merge branch 'master' of https://github.com/CorpusCallosum/LANscapes

Conflicts:
	LANscapes_OF83/src/ofApp.cpp