just synching...
Merge branch 'master' of github.com:CorpusCallosum/EphemeralArchitecture

Conflicts:
	lanscapesC_kinect/bin/LANscapesDebug.app/Contents/MacOS/LANscapesDebug

lanscapesC_kinect/build/LANscapes.build/Debug/LANscapes.build/Objects-no
rmal/i386/lanscapes.o

lanscapesC_kinect/build/LANscapes.build/Debug/LANscapes.build/build-stat
e.dat
	lanscapesC_kinect/src/lanscapes.cpp
	lanscapesC_kinect/src/lanscapes.h