pulling to
Merge branch 'master' of github.com:CorpusCallosum/EphemeralArchitecture

Conflicts:
	lanscapesC_kinect/bin/data/background.jpg